merge: fix/ux-leaf-e-crosscut into integration/ux-28-gaps (resolve conflicts on tasks-kanban-view, tasks-list-view, task-detail-panel)

apps/web/components/settings/settings-shortcuts.tsx

@@ -5,6 +5,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
 import { Button } from '@/components/ui/button';
 import { Switch } from '@/components/ui/switch';
 import { Label } from '@/components/ui/label';
+import { NotificationPrefs } from '@/components/notifications/notification-prefs';
 
 export function SettingsShortcuts() {
   const { enabled, shortcuts, setEnabled, resetShortcuts } = useKeyboardShortcutsStore();
@@ -49,6 +50,15 @@ export function SettingsShortcuts() {
         <Button variant="outline" onClick={resetShortcuts}>
           Reset to defaults
         </Button>
+
+        {/* Notification Preferences */}
+        <div className="pt-4 border-t">
+          <h3 className="font-semibold mb-1">Notification Preferences</h3>
+          <p className="text-sm text-muted-foreground mb-4">
+            Choose which events trigger in-app notifications.
+          </p>
+          <NotificationPrefs />
+        </div>
       </CardContent>
     </Card>
   );