diff --git a/ui/src/preferences/about-system/AboutSystem.tsx b/ui/src/preferences/about-system/AboutSystem.tsx index 106cad8d..1eded621 100644 --- a/ui/src/preferences/about-system/AboutSystem.tsx +++ b/ui/src/preferences/about-system/AboutSystem.tsx @@ -26,7 +26,7 @@ export const AboutSystem = () => { const { systemBlocked, blockedCharges, blockedCount, freezeApps } = useSystemUpdate(); const gardenBlocked = - null != blockedCharges.find((charge) => charge.desk == 'garden'); + null != blockedCharges.find((charge) => charge.desk == 'landscape'); const hash = basePike && getHash(basePike); const lag = useLag(); diff --git a/ui/src/state/vere.ts b/ui/src/state/vere.ts index 8977a79e..a3d96e0d 100644 --- a/ui/src/state/vere.ts +++ b/ui/src/state/vere.ts @@ -46,12 +46,14 @@ const fetchRuntimeVersion = () => { useVereState.setState((state) => { if (typeof data === 'object' && data !== null) { const vereData = data as Vere; - const vereVersion = vereData.cur.rev.split('/vere/~.')[1]; - const isLatest = vereData.next === undefined; + const vereVersion = vereData.cur.rev.split('/vere/live/~.')[1]; const latestVereVersion = vereData.next !== undefined - ? vereData.next.rev.split('/vere/~.')[1] + ? vereData.next.rev.split('/vere/live/~.')[1] : vereVersion; + const isLatest = + vereVersion === latestVereVersion || vereData.next === undefined; + return Object.assign(vereData, { loaded: true, isLatest, diff --git a/ui/src/tiles/TileGrid.tsx b/ui/src/tiles/TileGrid.tsx index 0695bb66..d56031eb 100644 --- a/ui/src/tiles/TileGrid.tsx +++ b/ui/src/tiles/TileGrid.tsx @@ -86,6 +86,7 @@ export const TileGrid = ({ menu }: TileGridProps) => { {order .filter((d) => d !== window.desk && d in charges) .filter((d) => d !== 'landscape') + .filter((d) => d !== 'garden') .map((desk) => (