Merge remote-tracking branch 'origin/main' into feat/filter-search

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

package.json

@@ -78,7 +78,7 @@
     "@discordapp/twemoji": "16.0.1",
     "@electron/notarize": "3.1.0",
     "@primer/css": "22.0.2",
-    "@primer/octicons-react": "19.16.0",
+    "@primer/octicons-react": "19.17.0",
     "@primer/primitives": "11.1.0",
     "@primer/react": "36.27.0",
     "@tailwindcss/postcss": "4.1.13",

pnpm-lock.yaml

@@ -7,7 +7,6 @@ import { AppContext } from '../../context/App';
 import type { FilterSettingsState, FilterValue } from '../../types';
 import type { Filter } from '../../utils/notifications/filters';
 import { Checkbox } from '../fields/Checkbox';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
@@ -34,22 +33,21 @@ export const FilterSection = <T extends FilterValue>({
 
   return (
     <fieldset id={id}>
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={icon}>{title}</Title>
-        {tooltip && (
-          <Tooltip
-            name={`tooltip-${id}`}
-            tooltip={
-              <Stack direction="vertical" gap="condensed">
-                {tooltip}
-                {filter.requiresDetailsNotifications && (
-                  <RequiresDetailedNotificationWarning />
-                )}
-              </Stack>
-            }
-          />
-        )}
-      </Stack>
+      <Title
+        icon={icon}
+        tooltip={
+          tooltip && (
+            <>
+              {tooltip}
+              {filter.requiresDetailsNotifications && (
+                <RequiresDetailedNotificationWarning />
+              )}
+            </>
+          )
+        }
+      >
+        {title}
+      </Title>
 
       <Stack
         direction={layout}

src/renderer/components/filters/FilterSection.tsx

@@ -17,7 +17,6 @@ import {
   hasIncludeSearchFilters,
   SEARCH_PREFIXES,
 } from '../../utils/notifications/filters/search';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
@@ -146,33 +145,33 @@ export const SearchFilter: FC = () => {
 
   return (
     <fieldset id={fieldsetId}>
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={SearchIcon}>Search</Title>
-        <Tooltip
-          name="tooltip-filter-actors"
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>Filter notifications by:</Text>
-              <Box className="pl-4">
-                <Stack direction="vertical" gap="condensed">
-                  <Stack direction="horizontal" gap="condensed">
-                    <PersonIcon size={Size.SMALL} />
-                    Author (author:handle)
-                  </Stack>
-                  <Stack direction="horizontal" gap="condensed">
-                    <OrganizationIcon size={Size.SMALL} />
-                    Organization (org:name)
-                  </Stack>
-                  <Stack direction="horizontal" gap="condensed">
-                    <RepoIcon size={Size.SMALL} /> Repository (repo:fullname)
-                  </Stack>
+      <Title
+        icon={SearchIcon}
+        tooltip={
+          <Stack direction="vertical" gap="condensed">
+            <Text>Filter notifications by:</Text>
+            <Box className="pl-4">
+              <Stack direction="vertical" gap="condensed">
+                <Stack direction="horizontal" gap="condensed">
+                  <PersonIcon size={Size.SMALL} />
+                  Author (author:handle)
                 </Stack>
-              </Box>
-              <RequiresDetailedNotificationWarning />
-            </Stack>
-          }
-        />
-      </Stack>
+                <Stack direction="horizontal" gap="condensed">
+                  <OrganizationIcon size={Size.SMALL} />
+                  Organization (org:name)
+                </Stack>
+                <Stack direction="horizontal" gap="condensed">
+                  <RepoIcon size={Size.SMALL} /> Repository (repo:fullname)
+                </Stack>
+              </Stack>
+            </Box>
+            <RequiresDetailedNotificationWarning />
+          </Stack>
+        }
+      >
+        Search
+      </Title>
+
       <Stack direction="vertical" gap="condensed">
         <Stack
           align="center"