diff --git a/apps/desktop/src/renderer/components/UpdateRequiredPage/UpdateRequiredPage.tsx b/apps/desktop/src/renderer/components/UpdateRequiredPage/UpdateRequiredPage.tsx
index 968020c7ced..af5ab804bcb 100644
--- a/apps/desktop/src/renderer/components/UpdateRequiredPage/UpdateRequiredPage.tsx
+++ b/apps/desktop/src/renderer/components/UpdateRequiredPage/UpdateRequiredPage.tsx
@@ -80,7 +80,7 @@ export function UpdateRequiredPage({
{isError && (
-
{updateStatus.error || "Update check failed. Please try again."}
)}
diff --git a/apps/desktop/src/renderer/hotkeys/hooks/useHotkey/useHotkey.ts b/apps/desktop/src/renderer/hotkeys/hooks/useHotkey/useHotkey.ts
index 97bcbf3ca2a..8c1fe184b07 100644
--- a/apps/desktop/src/renderer/hotkeys/hooks/useHotkey/useHotkey.ts
+++ b/apps/desktop/src/renderer/hotkeys/hooks/useHotkey/useHotkey.ts
@@ -17,7 +17,7 @@ export function useHotkey(
useHotkeys(
keys ?? "",
(e, _h) => callbackRef.current(e),
- { enableOnFormTags: true, ...options },
+ { enableOnFormTags: true, enableOnContentEditable: true, ...options },
[keys],
);
return formatHotkeyDisplay(keys, PLATFORM);
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/RightSidebarToggle/RightSidebarToggle.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/RightSidebarToggle/RightSidebarToggle.tsx
index 8484e02f3fa..ba124d377a4 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/RightSidebarToggle/RightSidebarToggle.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/RightSidebarToggle/RightSidebarToggle.tsx
@@ -1,4 +1,6 @@
import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
+import { eq } from "@tanstack/db";
+import { useLiveQuery } from "@tanstack/react-db";
import {
LuPanelRight,
LuPanelRightClose,
@@ -9,8 +11,16 @@ import { useCollections } from "renderer/routes/_authenticated/providers/Collect
export function RightSidebarToggle({ workspaceId }: { workspaceId: string }) {
const collections = useCollections();
- const localState = collections.v2WorkspaceLocalState.get(workspaceId);
- const isOpen = localState?.rightSidebarOpen ?? false;
+ const { data: localStateRows = [] } = useLiveQuery(
+ (query) =>
+ query
+ .from({ v2WorkspaceLocalState: collections.v2WorkspaceLocalState })
+ .where(({ v2WorkspaceLocalState }) =>
+ eq(v2WorkspaceLocalState.workspaceId, workspaceId),
+ ),
+ [collections, workspaceId],
+ );
+ const isOpen = localStateRows[0]?.rightSidebarOpen ?? false;
const toggle = () => {
collections.v2WorkspaceLocalState.update(workspaceId, (draft) => {
diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
index 239263c2eea..78e70cc9d39 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
@@ -314,7 +314,9 @@ function PendingWorkspacePage() {
- {pending.error ?? "Failed to create workspace"}
+
+ {pending.error ?? "Failed to create workspace"}
+