diff --git a/packages/app/src/components/composer.test.tsx b/packages/app/src/components/composer.test.tsx
index 237f52d20..94251943b 100644
--- a/packages/app/src/components/composer.test.tsx
+++ b/packages/app/src/components/composer.test.tsx
@@ -408,7 +408,7 @@ vi.mock("@/components/ui/shortcut", () => ({
 }));
 
 vi.mock("@/components/ui/tooltip", () => ({
-  Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  Tooltip: ({ children }: { children: React.ReactNode }) => children,
   TooltipTrigger: ({
     asChild,
     children,
@@ -423,13 +423,13 @@ vi.mock("@/components/ui/tooltip", () => ({
     disabled?: boolean;
   }) =>
     asChild ? (
-      <>{children}</>
+      children
     ) : (
       <button type="button" aria-label={accessibilityLabel} disabled={disabled} onClick={onPress}>
         {typeof children === "function" ? children({ hovered: false }) : children}
       </button>
     ),
-  TooltipContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => children,
 }));
 
 vi.mock("@/components/ui/dropdown-menu", () => {
diff --git a/packages/app/src/components/draggable-list.web.test.tsx b/packages/app/src/components/draggable-list.web.test.tsx
index 0725bef30..351079225 100644
--- a/packages/app/src/components/draggable-list.web.test.tsx
+++ b/packages/app/src/components/draggable-list.web.test.tsx
@@ -27,7 +27,7 @@ vi.mock("@dnd-kit/core", () => ({
 }));
 
 vi.mock("@dnd-kit/sortable", () => ({
-  SortableContext: ({ children }: React.PropsWithChildren) => <>{children}</>,
+  SortableContext: ({ children }: React.PropsWithChildren) => children,
   arrayMove: <T,>(items: T[], from: number, to: number) => {
     const next = [...items];
     const [item] = next.splice(from, 1);
diff --git a/packages/app/src/components/file-drop-zone.tsx b/packages/app/src/components/file-drop-zone.tsx
index 58b5ad523..70ce8c92a 100644
--- a/packages/app/src/components/file-drop-zone.tsx
+++ b/packages/app/src/components/file-drop-zone.tsx
@@ -40,7 +40,7 @@ export function FileDropZone({ children, onFilesDropped, disabled = false }: Fil
 
   // On non-web platforms, just render children
   if (!IS_WEB) {
-    return <>{children}</>;
+    return children;
   }
 
   return (
diff --git a/packages/app/src/components/host-route-bootstrap-boundary.tsx b/packages/app/src/components/host-route-bootstrap-boundary.tsx
index af28a3655..285bb61cb 100644
--- a/packages/app/src/components/host-route-bootstrap-boundary.tsx
+++ b/packages/app/src/components/host-route-bootstrap-boundary.tsx
@@ -12,5 +12,5 @@ export function HostRouteBootstrapBoundary({ children }: { children: ReactNode }
     return <StartupSplashScreen bootstrapState={isDesktop ? bootstrapState : undefined} />;
   }
 
-  return <>{children}</>;
+  return children;
 }
diff --git a/packages/app/src/components/message-input.test.tsx b/packages/app/src/components/message-input.test.tsx
index 6d814e76f..8e897b475 100644
--- a/packages/app/src/components/message-input.test.tsx
+++ b/packages/app/src/components/message-input.test.tsx
@@ -142,7 +142,7 @@ vi.mock("@/components/ui/shortcut", () => ({
 }));
 
 vi.mock("@/components/ui/tooltip", () => ({
-  Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  Tooltip: ({ children }: { children: React.ReactNode }) => children,
   TooltipTrigger: ({
     asChild,
     children,
@@ -152,17 +152,17 @@ vi.mock("@/components/ui/tooltip", () => ({
     children: React.ReactNode | ((state: { hovered: boolean }) => React.ReactNode);
   } & Record<string, any>) =>
     asChild ? (
-      <>{children}</>
+      children
     ) : (
       <button type="button" aria-label={props.accessibilityLabel}>
         {typeof children === "function" ? children({ hovered: false }) : children}
       </button>
     ),
-  TooltipContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => children,
 }));
 
 vi.mock("@/components/ui/dropdown-menu", () => ({
-  DropdownMenu: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  DropdownMenu: ({ children }: { children: React.ReactNode }) => children,
   DropdownMenuTrigger: ({
     children,
     testID,
diff --git a/packages/app/src/components/sortable-inline-list.web.test.tsx b/packages/app/src/components/sortable-inline-list.web.test.tsx
index 2abdce796..5196ea7ae 100644
--- a/packages/app/src/components/sortable-inline-list.web.test.tsx
+++ b/packages/app/src/components/sortable-inline-list.web.test.tsx
@@ -27,7 +27,7 @@ vi.mock("@dnd-kit/core", () => ({
 }));
 
 vi.mock("@dnd-kit/sortable", () => ({
-  SortableContext: ({ children }: React.PropsWithChildren) => <>{children}</>,
+  SortableContext: ({ children }: React.PropsWithChildren) => children,
   arrayMove: <T,>(items: T[], from: number, to: number) => {
     const next = [...items];
     const [item] = next.splice(from, 1);
diff --git a/packages/app/src/components/ui/combobox.tsx b/packages/app/src/components/ui/combobox.tsx
index 1015b6124..9549b8c82 100644
--- a/packages/app/src/components/ui/combobox.tsx
+++ b/packages/app/src/components/ui/combobox.tsx
@@ -315,7 +315,7 @@ export function Combobox({
   keepOpenOnSelect = false,
   anchorRef,
   children,
-}: ComboboxProps): ReactElement {
+}: ComboboxProps): ReactElement | null {
   const { theme } = useUnistyles();
   const isMobile = useIsCompactFormFactor();
   const titleColor = theme.colors.foreground;
@@ -704,24 +704,21 @@ export function Combobox({
     />
   );
 
-  const optionsList = (
-    <>
-      {orderedVisibleOptions.length > 0 ? (
-        orderedVisibleOptions.map((opt, index) => (
-          <OptionRow
-            key={opt.id}
-            option={opt}
-            selected={opt.id === value}
-            active={index === activeIndex}
-            onSelect={handleSelect}
-            renderOption={renderOption}
-          />
-        ))
-      ) : (
-        <ComboboxEmpty>{emptyText}</ComboboxEmpty>
-      )}
-    </>
-  );
+  const optionsList =
+    orderedVisibleOptions.length > 0 ? (
+      orderedVisibleOptions.map((opt, index) => (
+        <OptionRow
+          key={opt.id}
+          option={opt}
+          selected={opt.id === value}
+          active={index === activeIndex}
+          onSelect={handleSelect}
+          renderOption={renderOption}
+        />
+      ))
+    ) : (
+      <ComboboxEmpty>{emptyText}</ComboboxEmpty>
+    );
 
   const defaultContent = optionsList;
 
@@ -802,7 +799,7 @@ export function Combobox({
     );
   }
 
-  if (!isOpen) return <></>;
+  if (!isOpen) return null;
 
   return (
     <Modal transparent animationType="none" visible={isOpen} onRequestClose={handleClose}>
diff --git a/packages/app/src/components/ui/tooltip.test.tsx b/packages/app/src/components/ui/tooltip.test.tsx
index 78f634574..6482b09ad 100644
--- a/packages/app/src/components/ui/tooltip.test.tsx
+++ b/packages/app/src/components/ui/tooltip.test.tsx
@@ -16,7 +16,7 @@ vi.mock("@/constants/layout", () => ({
 }));
 
 vi.mock("@gorhom/portal", () => ({
-  Portal: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  Portal: ({ children }: { children: React.ReactNode }) => children,
 }));
 
 vi.mock("@gorhom/bottom-sheet", () => ({
diff --git a/packages/app/src/components/workspace-hover-card.tsx b/packages/app/src/components/workspace-hover-card.tsx
index ce358292a..b0eafae7e 100644
--- a/packages/app/src/components/workspace-hover-card.tsx
+++ b/packages/app/src/components/workspace-hover-card.tsx
@@ -6,6 +6,7 @@ import {
   useState,
   type PropsWithChildren,
   type ReactElement,
+  type ReactNode,
 } from "react";
 import { Dimensions, Platform, Text, View } from "react-native";
 import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
@@ -81,10 +82,10 @@ export function WorkspaceHoverCard({
   prHint,
   isDragging,
   children,
-}: PropsWithChildren<WorkspaceHoverCardProps>): ReactElement {
+}: PropsWithChildren<WorkspaceHoverCardProps>): ReactNode {
   // Desktop-only: skip on non-web platforms
   if (Platform.OS !== "web") {
-    return <>{children}</>;
+    return children;
   }
 
   return (
diff --git a/packages/app/src/screens/new-workspace-screen.test.tsx b/packages/app/src/screens/new-workspace-screen.test.tsx
index 2f497cc19..091b66c2e 100644
--- a/packages/app/src/screens/new-workspace-screen.test.tsx
+++ b/packages/app/src/screens/new-workspace-screen.test.tsx
@@ -430,9 +430,9 @@ vi.mock("@/components/headers/screen-header", () => ({
 }));
 
 vi.mock("@/components/ui/tooltip", () => ({
-  Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  TooltipTrigger: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  TooltipContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  Tooltip: ({ children }: { children: React.ReactNode }) => children,
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) => children,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => children,
 }));
 
 function ComboboxOptionButton({