From b3a8737a71ae6cabebf409b5ad3f086cb1f345c9 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 28 Apr 2026 16:27:39 +0200 Subject: [PATCH] move Version from status to settings --- interface/src/AuthenticatedRouting.tsx | 4 ++-- interface/src/app/settings/Settings.tsx | 8 ++++---- interface/src/app/{status => settings}/Version.tsx | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename interface/src/app/{status => settings}/Version.tsx (100%) diff --git a/interface/src/AuthenticatedRouting.tsx b/interface/src/AuthenticatedRouting.tsx index 8ace232aa..1bab479ae 100644 --- a/interface/src/AuthenticatedRouting.tsx +++ b/interface/src/AuthenticatedRouting.tsx @@ -16,6 +16,7 @@ import DownloadUpload from 'app/settings/DownloadUpload'; import MqttSettings from 'app/settings/MqttSettings'; import NTPSettings from 'app/settings/NTPSettings'; import Settings from 'app/settings/Settings'; +import Version from 'app/settings/Version'; import Network from 'app/settings/network/Network'; import Security from 'app/settings/security/Security'; import APStatus from 'app/status/APStatus'; @@ -26,7 +27,6 @@ import NTPStatus from 'app/status/NTPStatus'; import NetworkStatus from 'app/status/NetworkStatus'; import Status from 'app/status/Status'; import SystemLog from 'app/status/SystemLog'; -import Version from 'app/status/Version'; import { Layout } from 'components'; import { AuthenticatedContext } from 'contexts/authentication'; @@ -49,11 +49,11 @@ const AuthenticatedRouting = memo(() => { } /> } /> } /> - } /> {me.admin && ( <> } /> + } /> } /> } /> } /> diff --git a/interface/src/app/settings/Settings.tsx b/interface/src/app/settings/Settings.tsx index 9aab496b7..85d66f39a 100644 --- a/interface/src/app/settings/Settings.tsx +++ b/interface/src/app/settings/Settings.tsx @@ -41,10 +41,10 @@ const Settings = () => { const { versions } = useContext(AuthenticatedContext); useLayoutTitle(LL.SETTINGS(0)); - const firmwareText = versions?.current?.version - ? `v${versions.current.version}` - : ''; const upgradeAvailable = versions?.current?.upgradeable ?? false; + const firmwareText = versions?.current?.version + ? `v${versions.current.version}${upgradeAvailable ? ` (${LL.UPDATE_AVAILABLE()})` : ''}` + : ''; const [confirmFactoryReset, setConfirmFactoryReset] = useState(false); const [confirmRestart, setConfirmRestart] = useState(false); @@ -99,7 +99,7 @@ const Settings = () => { bgcolor="#72caf9" label="EMS-ESP Firmware" text={firmwareText} - to="/status/version" + to="/settings/version" badge={upgradeAvailable} /> diff --git a/interface/src/app/status/Version.tsx b/interface/src/app/settings/Version.tsx similarity index 100% rename from interface/src/app/status/Version.tsx rename to interface/src/app/settings/Version.tsx