merge: resolve conflicts with origin/master

2026-06-03 20:23:27 +08:00
parent f5a75074a4 7a62ccc1ca
commit 1998eb21c5
11 changed files with 5248 additions and 81 deletions
@@ -90,7 +90,7 @@ function AppShell({
    "avatarConsole",
    "characterMix",
  ] as WebViewKey[];
-  const showPageScrollActions = showFloatingNav && !toolSurfaceViews.includes(activeView);
+  const showPageScrollActions = false;

  const visibleNavItems = useMemo(
    () => {