Open-source personal finance manager. Self-hosted, privacy-first.
feat: unify category selection UI and introduce category grouping (#160)
Rodrigo Tavares0d9d82108cf4
diff --git a/frontend/src/components/category-select.tsx b/frontend/src/components/category-select.tsxnew file mode 100644index 00000000..13843270--- /dev/null+++ b/frontend/src/components/category-select.tsx@@ -0,0 +1,83 @@+import { useMemo } from 'react'+import { useTranslation } from 'react-i18next'+import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectTrigger, SelectValue } from '@/components/ui/select'+import type { Category, CategoryGroup } from '@/types'++interface CategorySelectProps {+ value: string+ onChange: (value: string) => void+ categories: Category[]+ groups: CategoryGroup[]+ placeholder?: string+ disabled?: boolean+ className?: string+ allowNone?: boolean+ contentProps?: React.ComponentProps<typeof SelectContent>+}++export function CategorySelect({+ value,+ onChange,+ categories,+ groups,+ placeholder = 'Select category',+ disabled = false,+ className = "w-full border border-border rounded-md px-3 py-2 text-sm bg-background disabled:opacity-50 disabled:cursor-not-allowed focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]",+ allowNone = false,+ contentProps,+}: CategorySelectProps) {+ const { t } = useTranslation()++ const displayGroups = useMemo(() => {+ const ungrouped = (categories ?? []).filter((c) => !c.group_id)+ if (ungrouped.length === 0) return groups++ return [+ ...groups,+ {+ id: 'ungrouped-virtual',+ name: t('groups.noGroup'),+ categories: ungrouped,+ } as CategoryGroup,+ ]+ }, [categories, groups, t])++ return (+ <Select+ value={value === '' ? (allowNone ? 'none' : undefined) : value}+ onValueChange={(nextValue) => {+ onChange(nextValue === 'none' ? '' : nextValue)+ }}+ disabled={disabled}+ >+ <SelectTrigger className={className}>+ <SelectValue placeholder={placeholder} />+ </SelectTrigger>+ <SelectContent position="popper" {...contentProps}>+ {allowNone && (+ <SelectItem value="none" className="italic text-muted-foreground">+ {t('transactions.noCategory')}+ </SelectItem>+ )}+ {displayGroups.map((group) => (+ <SelectGroup key={group.id}>+ <SelectLabel className="px-2 py-1.5 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">+ {group.name}+ </SelectLabel>+ {group.categories.map((cat) => (+ <SelectItem key={cat.id} value={cat.id}>+ {cat.color ? (+ <span+ className="size-2.5 shrink-0 rounded-full border border-black/5"+ style={{ backgroundColor: cat.color }}+ />+ ) : null}+ <span>{cat.name}</span>+ </SelectItem>+ ))}+ </SelectGroup>+ ))}+ </SelectContent>+ </Select>+ )+}diff --git a/frontend/src/components/transaction-dialog.tsx b/frontend/src/components/transaction-dialog.tsxindex 301c1dee..c3bb2ac2 100644--- a/frontend/src/components/transaction-dialog.tsx+++ b/frontend/src/components/transaction-dialog.tsx@@ -23,10 +23,11 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from '@/components/ui/dropdown-menu'+import { CategorySelect } from '@/components/category-select'import { TransactionAttachments } from '@/components/transaction-attachments'import type { AttachmentPreview } from '@/components/transaction-attachments'import { TransactionSplitsSection } from '@/components/transaction-splits-section'-import type { Transaction, RecurringTransaction, TransactionSplitsInput } from '@/types'+import type { Transaction, RecurringTransaction, TransactionSplitsInput, CategoryGroup, Category } from '@/types'import { toast } from 'sonner'export type SaveAction = 'save' | 'saveAndNew' | 'saveAndDuplicate'@@ -64,6 +65,7 @@ export function TransactionDialog({onClose,transaction,categories,+ categoryGroups,accounts,recurringMatch,onSave,@@ -78,7 +80,8 @@ export function TransactionDialog({open: booleanonClose: () => voidtransaction: Transaction | null- categories: { id: string; name: string; icon: string }[]+ categories: Category[]+ categoryGroups: CategoryGroup[]accounts: { id: string; name: string; type?: string }[]recurringMatch?: RecurringTransactiononSave: (data: Partial<Transaction>, recurringData?: { frequency: string; end_date?: string }, pendingFiles?: File[], action?: SaveAction) => void@@ -148,6 +151,7 @@ export function TransactionDialog({transaction={transaction}duplicateDraft={duplicateDraft}categories={categories}+ categoryGroups={categoryGroups}accounts={accounts}recurringMatch={recurringMatch}onSave={onSave}@@ -263,6 +267,7 @@ function TransactionForm({transaction,duplicateDraft,categories,+ categoryGroups,accounts,recurringMatch,onSave,@@ -278,7 +283,8 @@ function TransactionForm({}: {transaction: Transaction | nullduplicateDraft: Partial<Transaction> | null- categories: { id: string; name: string; icon: string }[]+ categories: Category[]+ categoryGroups: CategoryGroup[]accounts: { id: string; name: string; type?: string }[]recurringMatch?: RecurringTransactiononSave: (data: Partial<Transaction>, recurringData?: { frequency: string; end_date?: string }, pendingFiles?: File[], action?: SaveAction) => void@@ -652,16 +658,13 @@ function TransactionForm({</div><div className="space-y-2"><Label>{t('transactions.category')}</Label>- <select- className="w-full border border-border rounded-md px-3 py-2 text-sm bg-background disabled:opacity-50 disabled:cursor-not-allowed focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"+ <CategorySelectvalue={categoryId}- onChange={(e) => setCategoryId(e.target.value)}- >- <option value="">{t('transactions.noCategory')}</option>- {categories.map((cat) => (- <option key={cat.id} value={cat.id}>{cat.name}</option>- ))}- </select>+ onChange={setCategoryId}+ categories={categories}+ groups={categoryGroups}+ allowNone={true}+ /></div></div><div className={cn("grid gap-4", isSynced ? "grid-cols-1" : "grid-cols-2")}>diff --git a/frontend/src/components/transactions-filter-bar.tsx b/frontend/src/components/transactions-filter-bar.tsxindex 1cdd31db..8b7f218d 100644--- a/frontend/src/components/transactions-filter-bar.tsx+++ b/frontend/src/components/transactions-filter-bar.tsx@@ -19,6 +19,7 @@ import { ptBR, enUS } from 'date-fns/locale'import {DropdownMenu,+ DropdownMenuCheckboxItem,DropdownMenuContent,DropdownMenuGroup,DropdownMenuItem,@@ -38,7 +39,7 @@ import {import { Calendar } from '@/components/ui/calendar'import { Button } from '@/components/ui/button'import { cn } from '@/lib/utils'-import type { Account, Category, Group, Payee } from '@/types'+import type { Account, Category, CategoryGroup, Group, Payee } from '@/types'interface TransactionsFilterBarProps {searchInput: string@@ -62,6 +63,7 @@ interface TransactionsFilterBarProps {onClearAll: () => voidaccounts: Account[]categories: Category[]+ categoryGroups: CategoryGroup[]payees: Payee[]groups: Group[]}@@ -96,6 +98,7 @@ export function TransactionsFilterBar({onClearAll,accounts,categories,+ categoryGroups,payees,groups,}: TransactionsFilterBarProps) {@@ -152,6 +155,20 @@ export function TransactionsFilterBar({return map}, [categories])+ const displayCategoryGroups = useMemo(() => {+ const ungroupedCategories = categories.filter((c) => !c.group_id)+ if (ungroupedCategories.length === 0) return categoryGroups++ return [+ ...categoryGroups,+ {+ id: 'ungrouped',+ name: t('groups.noGroup'),+ categories: ungroupedCategories,+ } as CategoryGroup,+ ]+ }, [categories, categoryGroups, t])+const selectedPayee = useMemo(() => payees.find((p) => p.id === filterPayee),[payees, filterPayee],@@ -346,18 +363,27 @@ export function TransactionsFilterBar({</div>) : (accounts.map((a) => (- <CheckRow+ <DropdownMenuCheckboxItemkey={a.id}checked={filterAccountIds.includes(a.id)}- onToggle={() => {+ onSelect={(e) => {+ e.preventDefault()keepAccountSubOpenRef.current = trueonAccountIdsChange(toggleInArray(filterAccountIds, a.id),)}}- label={getAccountName(a)}- sublabel={a.currency}- />+ className="gap-2 rounded-sm py-1.5 text-[13px]"+ >+ <span className="min-w-0 flex-1 truncate text-left">+ {getAccountName(a)}+ </span>+ {a.currency && (+ <span className="text-[10.5px] uppercase tracking-wide text-muted-foreground/70">+ {a.currency}+ </span>+ )}+ </DropdownMenuCheckboxItem>)))}{filterAccountIds.length > 0 && (@@ -399,34 +425,55 @@ export function TransactionsFilterBar({sideOffset={8}className="max-h-[320px] w-[240px] overflow-y-auto p-1">- <CheckRow+ <DropdownMenuCheckboxItemchecked={filterUncategorized}- onToggle={() => {+ onSelect={(e) => {+ e.preventDefault()keepCategorySubOpenRef.current = trueonUncategorizedChange(!filterUncategorized)}}- label={t('transactions.uncategorized')}- italic- />+ className="gap-2 rounded-sm py-1.5 text-[13px]"+ >+ <span className="min-w-0 flex-1 truncate text-left italic text-muted-foreground">+ {t('transactions.uncategorized')}+ </span>+ </DropdownMenuCheckboxItem><div className="my-1 h-px bg-border/60" />- {categories.length === 0 ? (+ {displayCategoryGroups.length === 0 ? (<div className="px-2 py-3 text-center text-[12px] text-muted-foreground">{t('transactions.filtersBar.noOptions')}</div>) : (- categories.map((c) => (- <CheckRow- key={c.id}- checked={filterCategoryIds.includes(c.id)}- onToggle={() => {- keepCategorySubOpenRef.current = true- onCategoryIdsChange(- toggleInArray(filterCategoryIds, c.id),- )- }}- label={c.name}- swatchColor={c.color ?? undefined}- />+ displayCategoryGroups.map((group) => (+ <DropdownMenuGroup key={group.id}>+ <DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">+ {group.name}+ </DropdownMenuLabel>+ {group.categories.map((c) => (+ <DropdownMenuCheckboxItem+ key={c.id}+ checked={filterCategoryIds.includes(c.id)}+ onSelect={(e) => {+ e.preventDefault()+ keepCategorySubOpenRef.current = true+ onCategoryIdsChange(+ toggleInArray(filterCategoryIds, c.id),+ )+ }}+ className="gap-2 rounded-sm py-1.5 text-[13px]"+ >+ {c.color ? (+ <span+ className="size-2.5 shrink-0 rounded-full border border-black/5"+ style={{ backgroundColor: c.color }}+ />+ ) : null}+ <span className="min-w-0 flex-1 truncate text-left">+ {c.name}+ </span>+ </DropdownMenuCheckboxItem>+ ))}+ </DropdownMenuGroup>)))}{(filterCategoryIds.length > 0 || filterUncategorized) && (@@ -918,69 +965,6 @@ function FilterChip({ icon, label, value, tint, onRemove }: FilterChipProps) {)}-interface CheckRowProps {- checked: boolean- onToggle: () => void- label: string- sublabel?: string- swatchColor?: string- italic?: boolean-}--function CheckRow({- checked,- onToggle,- label,- sublabel,- swatchColor,- italic,-}: CheckRowProps) {- return (- <DropdownMenuItem- onSelect={(e) => {- // Keep the menu open so users can select multiple options.- e.preventDefault()- onToggle()- }}- className={cn(- 'gap-2 rounded-sm px-2 py-1.5 text-[13px]',- checked && 'bg-primary/5 data-[highlighted]:bg-primary/10',- )}- >- <span- className={cn(- 'flex size-[14px] shrink-0 items-center justify-center rounded-[4px] border transition-colors',- checked- ? 'border-primary bg-primary text-primary-foreground'- : 'border-border/80 bg-background',- )}- >- {checked && <Check size={10} strokeWidth={3} />}- </span>- {swatchColor ? (- <span- className="size-2.5 shrink-0 rounded-full border border-black/5"- style={{ backgroundColor: swatchColor }}- />- ) : null}- <span- className={cn(- 'min-w-0 flex-1 truncate text-left',- italic && 'italic text-muted-foreground',- )}- >- {label}- </span>- {sublabel && (- <span className="text-[10.5px] uppercase tracking-wide text-muted-foreground/70">- {sublabel}- </span>- )}- </DropdownMenuItem>- )-}--// Search input with inline `#tag` chips. Free text is a normal input;// `#`-prefixed words become purple chips when committed via comma, space// (when token starts with `#`), or Enter, and immediately apply as filters.diff --git a/frontend/src/components/ui/dropdown-menu.tsx b/frontend/src/components/ui/dropdown-menu.tsxindex bffc3276..3bb38bc7 100644--- a/frontend/src/components/ui/dropdown-menu.tsx+++ b/frontend/src/components/ui/dropdown-menu.tsx@@ -92,15 +92,23 @@ function DropdownMenuCheckboxItem({<DropdownMenuPrimitive.CheckboxItemdata-slot="dropdown-menu-checkbox-item"className={cn(- "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",+ checked && "bg-primary/5 data-[highlighted]:bg-primary/10",className)}checked={checked}{...props}>- <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">+ <span+ className={cn(+ "flex size-[14px] shrink-0 items-center justify-center rounded-[4px] border transition-colors",+ checked+ ? "border-primary bg-primary text-primary-foreground"+ : "border-border/80 bg-background"+ )}+ ><DropdownMenuPrimitive.ItemIndicator>- <CheckIcon className="size-4" />+ <CheckIcon className="size-2.5" strokeWidth={3} /></DropdownMenuPrimitive.ItemIndicator></span>{children}diff --git a/frontend/src/components/ui/select.tsx b/frontend/src/components/ui/select.tsxnew file mode 100644index 00000000..182ba554--- /dev/null+++ b/frontend/src/components/ui/select.tsx@@ -0,0 +1,188 @@+import * as React from "react"+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"+import { Select as SelectPrimitive } from "radix-ui"++import { cn } from "@/lib/utils"++function Select({+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Root>) {+ return <SelectPrimitive.Root data-slot="select" {...props} />+}++function SelectGroup({+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Group>) {+ return <SelectPrimitive.Group data-slot="select-group" {...props} />+}++function SelectValue({+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Value>) {+ return <SelectPrimitive.Value data-slot="select-value" {...props} />+}++function SelectTrigger({+ className,+ size = "default",+ children,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {+ size?: "sm" | "default"+}) {+ return (+ <SelectPrimitive.Trigger+ data-slot="select-trigger"+ data-size={size}+ className={cn(+ "flex w-fit items-center justify-between gap-2 rounded-md border border-input bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[placeholder]:text-muted-foreground data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",+ className+ )}+ {...props}+ >+ {children}+ <SelectPrimitive.Icon asChild>+ <ChevronDownIcon className="size-4 opacity-50" />+ </SelectPrimitive.Icon>+ </SelectPrimitive.Trigger>+ )+}++function SelectContent({+ className,+ children,+ position = "item-aligned",+ align = "center",+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Content>) {+ return (+ <SelectPrimitive.Portal>+ <SelectPrimitive.Content+ data-slot="select-content"+ className={cn(+ "relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover text-popover-foreground shadow-md data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",+ position === "popper" &&+ "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",+ className+ )}+ position={position}+ align={align}+ {...props}+ >+ <SelectScrollUpButton />+ <SelectPrimitive.Viewport+ className={cn(+ "p-1",+ position === "popper" &&+ "w-full min-w-[var(--radix-select-trigger-width)] max-h-[var(--radix-select-content-available-height)] scroll-my-1"+ )}+ >+ {children}+ </SelectPrimitive.Viewport>+ <SelectScrollDownButton />+ </SelectPrimitive.Content>+ </SelectPrimitive.Portal>+ )+}++function SelectLabel({+ className,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Label>) {+ return (+ <SelectPrimitive.Label+ data-slot="select-label"+ className={cn("px-2 py-1.5 text-xs text-muted-foreground", className)}+ {...props}+ />+ )+}++function SelectItem({+ className,+ children,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Item>) {+ return (+ <SelectPrimitive.Item+ data-slot="select-item"+ className={cn(+ "relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",+ className+ )}+ {...props}+ >+ <span+ data-slot="select-item-indicator"+ className="absolute right-2 flex size-3.5 items-center justify-center"+ >+ <SelectPrimitive.ItemIndicator>+ <CheckIcon className="size-4" />+ </SelectPrimitive.ItemIndicator>+ </span>+ <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>+ </SelectPrimitive.Item>+ )+}++function SelectSeparator({+ className,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.Separator>) {+ return (+ <SelectPrimitive.Separator+ data-slot="select-separator"+ className={cn("pointer-events-none -mx-1 my-1 h-px bg-border", className)}+ {...props}+ />+ )+}++function SelectScrollUpButton({+ className,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {+ return (+ <SelectPrimitive.ScrollUpButton+ data-slot="select-scroll-up-button"+ className={cn(+ "flex cursor-default items-center justify-center py-1",+ className+ )}+ {...props}+ >+ <ChevronUpIcon className="size-4" />+ </SelectPrimitive.ScrollUpButton>+ )+}++function SelectScrollDownButton({+ className,+ ...props+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {+ return (+ <SelectPrimitive.ScrollDownButton+ data-slot="select-scroll-down-button"+ className={cn(+ "flex cursor-default items-center justify-center py-1",+ className+ )}+ {...props}+ >+ <ChevronDownIcon className="size-4" />+ </SelectPrimitive.ScrollDownButton>+ )+}++export {+ Select,+ SelectContent,+ SelectGroup,+ SelectItem,+ SelectLabel,+ SelectScrollDownButton,+ SelectScrollUpButton,+ SelectSeparator,+ SelectTrigger,+ SelectValue,+}diff --git a/frontend/src/pages/account-detail.tsx b/frontend/src/pages/account-detail.tsxindex 92d4f16b..0fdcfa0f 100644--- a/frontend/src/pages/account-detail.tsx+++ b/frontend/src/pages/account-detail.tsx@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'import { useQuery, useQueries, useMutation, useQueryClient } from '@tanstack/react-query'import { format, addDays, addMonths, parseISO } from 'date-fns'import { ptBR, enUS } from 'date-fns/locale'-import { accounts, transactions, categories as categoriesApi } from '@/lib/api'+import { accounts, transactions, categories as categoriesApi, categoryGroups as categoryGroupsApi } from '@/lib/api'import { invalidateFinancialQueries } from '@/lib/invalidate-queries'import { toast } from 'sonner'import type { CreditCardBill, Transaction } from '@/types'@@ -523,6 +523,11 @@ export default function AccountDetailPage() {queryFn: categoriesApi.list,})+ const { data: categoryGroupsList } = useQuery({+ queryKey: ['categoryGroups'],+ queryFn: categoryGroupsApi.list,+ })+const updateMutation = useMutation({mutationFn: ({ id: txId, ...data }: Partial<Transaction> & { id: string }) =>transactions.update(txId, data),@@ -1446,6 +1451,7 @@ export default function AccountDetailPage() {onClose={() => { setDialogOpen(false); setEditingTx(null) }}transaction={editingTx}categories={categoriesList ?? []}+ categoryGroups={categoryGroupsList ?? []}accounts={accountsList ?? []}onSave={(data) => {if (editingTx) {diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsxindex d881b261..5d5dba02 100644--- a/frontend/src/pages/dashboard.tsx+++ b/frontend/src/pages/dashboard.tsx@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'import { format } from 'date-fns'import { ptBR, enUS } from 'date-fns/locale'-import { dashboard, transactions, budgets, categories as categoriesApi, accounts as accountsApi, goals as goalsApi, groups as groupsApi } from '@/lib/api'+import { dashboard, transactions, budgets, categories as categoriesApi, categoryGroups as categoryGroupsApi, accounts as accountsApi, goals as goalsApi, groups as groupsApi } from '@/lib/api'import { invalidateFinancialQueries } from '@/lib/invalidate-queries'import { Skeleton } from '@/components/ui/skeleton'import { Button } from '@/components/ui/button'@@ -154,6 +154,11 @@ export default function DashboardPage() {queryFn: categoriesApi.list,})+ const { data: categoryGroupsList } = useQuery({+ queryKey: ['categoryGroups'],+ queryFn: categoryGroupsApi.list,+ })+const { data: accountsList } = useQuery({queryKey: ['accounts'],queryFn: () => accountsApi.list(),@@ -1043,7 +1048,8 @@ export default function DashboardPage() {open={dialogOpen}onClose={() => { setDialogOpen(false); setEditingTx(null) }}transaction={editingTx}- categories={(categoriesList ?? []).map((c: { id: string; name: string; icon: string }) => ({ id: c.id, name: c.name, icon: c.icon }))}+ categories={categoriesList ?? []}+ categoryGroups={categoryGroupsList ?? []}accounts={(accountsList ?? []).map((a: { id: string; name: string; display_name?: string | null }) => ({ id: a.id, name: getAccountName(a) }))}onSave={(data) => {if (editingTx) updateMutation.mutate({ id: editingTx.id, ...data })diff --git a/frontend/src/pages/recurring.tsx b/frontend/src/pages/recurring.tsxindex f5b29c92..0fa6ff69 100644--- a/frontend/src/pages/recurring.tsx+++ b/frontend/src/pages/recurring.tsx@@ -2,7 +2,7 @@ import React, { useState } from 'react'import { getAccountName } from '@/lib/account-utils'import { useTranslation } from 'react-i18next'import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'-import { categories as categoriesApi, recurring as recurringApi, accounts as accountsApi, currencies as currenciesApi } from '@/lib/api'+import { categories as categoriesApi, categoryGroups as categoryGroupsApi, recurring as recurringApi, accounts as accountsApi, currencies as currenciesApi } from '@/lib/api'import { invalidateFinancialQueries } from '@/lib/invalidate-queries'import { toast } from 'sonner'import { Button } from '@/components/ui/button'@@ -15,10 +15,11 @@ import {DialogTitle,DialogFooter,} from '@/components/ui/dialog'-import type { Category, RecurringTransaction } from '@/types'+import type { Category, CategoryGroup, RecurringTransaction } from '@/types'import { Pencil, Trash2, Plus, RefreshCw, Info } from 'lucide-react'import { cn } from '@/lib/utils'import { PageHeader } from '@/components/page-header'+import { CategorySelect } from '@/components/category-select'import { DatePickerInput } from '@/components/ui/date-picker-input'import { usePrivacyMode } from '@/hooks/use-privacy-mode'import { useAuth } from '@/contexts/auth-context'@@ -77,6 +78,11 @@ function RecurringTab() {queryFn: categoriesApi.list,})+ const { data: categoryGroupsList } = useQuery({+ queryKey: ['categoryGroups'],+ queryFn: categoryGroupsApi.list,+ })+const { data: accountsList } = useQuery({queryKey: ['accounts'],queryFn: () => accountsApi.list(),@@ -233,6 +239,7 @@ function RecurringTab() {key={editing?.id ?? 'new'}recurring={editing}categories={categoriesList ?? []}+ categoryGroups={categoryGroupsList ?? []}accounts={accountsList ?? []}onSave={(data) => {if (editing) {@@ -253,6 +260,7 @@ function RecurringTab() {function RecurringForm({recurring,categories,+ categoryGroups,accounts,onSave,onCancel,@@ -260,6 +268,7 @@ function RecurringForm({}: {recurring: RecurringTransaction | nullcategories: Category[]+ categoryGroups: CategoryGroup[]accounts: { id: string; name: string }[]onSave: (data: Partial<RecurringTransaction>) => voidonCancel: () => void@@ -361,12 +370,14 @@ function RecurringForm({<div className="grid grid-cols-2 gap-4"><div className="space-y-2"><Label>{t('recurring.category')}</Label>- <select className={selectClass} value={categoryId} onChange={(e) => setCategoryId(e.target.value)}>- <option value="">{t('transactions.noCategory')}</option>- {categories.map((cat) => (- <option key={cat.id} value={cat.id}>{cat.name}</option>- ))}- </select>+ <CategorySelect+ value={categoryId}+ onChange={setCategoryId}+ categories={categories}+ groups={categoryGroups}+ allowNone={true}+ className={selectClass}+ /></div><div className="space-y-2"><Label>{t('recurring.account')}</Label>diff --git a/frontend/src/pages/rules.tsx b/frontend/src/pages/rules.tsxindex 569b0d1a..9c98c8eb 100644--- a/frontend/src/pages/rules.tsx+++ b/frontend/src/pages/rules.tsx@@ -2,7 +2,7 @@ import { useState, useMemo } from 'react'import { getAccountName } from '@/lib/account-utils'import { useTranslation } from 'react-i18next'import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'-import { categories as categoriesApi, rules as rulesApi, accounts as accountsApi, payees as payeesApi } from '@/lib/api'+import { categories as categoriesApi, categoryGroups as categoryGroupsApi, rules as rulesApi, accounts as accountsApi, payees as payeesApi } from '@/lib/api'import { invalidateFinancialQueries } from '@/lib/invalidate-queries'import { toast } from 'sonner'import { Button } from '@/components/ui/button'@@ -15,9 +15,10 @@ import {DialogTitle,DialogFooter,} from '@/components/ui/dialog'-import type { Category, Payee, Rule, RuleCondition, RuleAction } from '@/types'+import type { Category, CategoryGroup, Payee, Rule, RuleCondition, RuleAction } from '@/types'import { Trash2, Plus, RefreshCw, X, Package, Check, ArrowUpDown, ArrowUp, ArrowDown } from 'lucide-react'import { cn } from '@/lib/utils'+import { CategorySelect } from '@/components/category-select'import { PageHeader } from '@/components/page-header'function SectionCard({ children }: { children: React.ReactNode }) {@@ -127,6 +128,11 @@ export default function RulesPage() {queryFn: categoriesApi.list,})+ const { data: categoryGroupsList } = useQuery({+ queryKey: ['categoryGroups'],+ queryFn: categoryGroupsApi.list,+ })+const { data: accountsList } = useQuery({queryKey: ['accounts'],queryFn: () => accountsApi.list(),@@ -330,6 +336,7 @@ export default function RulesPage() {onClose={() => { setDialogOpen(false); setEditing(null) }}rule={editing}categories={categories}+ categoryGroups={categoryGroupsList ?? []}accounts={accountsList ?? []}payees={payees}onSave={(data) => {@@ -444,12 +451,13 @@ function RulePacksDialog({ open, onClose }: { open: boolean; onClose: () => void}function RuleDialog({- open, onClose, rule, categories, accounts, payees, onSave, loading,+ open, onClose, rule, categories, categoryGroups, accounts, payees, onSave, loading,}: {open: booleanonClose: () => voidrule: Rule | nullcategories: Category[]+ categoryGroups: CategoryGroup[]accounts: { id: string; name: string }[]payees: Payee[]onSave: (data: Partial<Rule>) => void@@ -633,17 +641,16 @@ function RuleDialog({<option value="append_notes">{t('rules.appendNotes')}</option></select>{action.op === 'set_category' ? (- <select- className={`${selectClass} w-0 flex-1 min-w-0`}- value={action.value}- onChange={(e) => updateAction(i, 'value', e.target.value)}- required- >- <option value="">{t('rules.selectCategory')}</option>- {categories.map(cat => (- <option key={cat.id} value={cat.id}>{cat.name}</option>- ))}- </select>+ <div className="w-0 flex-1 min-w-0">+ <CategorySelect+ value={action.value}+ onChange={(val) => updateAction(i, 'value', val)}+ categories={categories}+ groups={categoryGroups}+ placeholder={t('rules.selectCategory')}+ className={`${selectClass} w-full`}+ />+ </div>) : action.op === 'set_payee' ? (<selectclassName={`${selectClass} w-0 flex-1 min-w-0`}diff --git a/frontend/src/pages/transactions.tsx b/frontend/src/pages/transactions.tsxindex 0e04d772..704a15c7 100644--- a/frontend/src/pages/transactions.tsx+++ b/frontend/src/pages/transactions.tsx@@ -3,7 +3,7 @@ import { getAccountName } from '@/lib/account-utils'import { useNavigate, useSearchParams } from 'react-router-dom'import { useTranslation } from 'react-i18next'import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'-import { transactions, categories as categoriesApi, accounts as accountsApi, recurring, payees as payeesApi, admin, groups as groupsApi } from '@/lib/api'+import { transactions, categories as categoriesApi, categoryGroups as categoryGroupsApi, accounts as accountsApi, recurring, payees as payeesApi, admin, groups as groupsApi } from '@/lib/api'import { invalidateFinancialQueries } from '@/lib/invalidate-queries'import { toast } from 'sonner'import { Button } from '@/components/ui/button'@@ -27,6 +27,7 @@ import { AlertTriangle, ArrowLeftRight, ArrowUp, ArrowDown, Check, Copy, Downloaimport type { Transaction } from '@/types'import { PageHeader } from '@/components/page-header'import { CategoryIcon } from '@/components/category-icon'+import { CategorySelect } from '@/components/category-select'import { TransactionDialog, extractApiError, type SaveAction } from '@/components/transaction-dialog'import { TransactionsColumnPicker } from '@/components/transactions-column-picker'import { type ColumnDef, type ColumnId, useTransactionsGridState } from '@/components/transactions-grid-columns'@@ -251,6 +252,11 @@ export default function TransactionsPage() {queryFn: categoriesApi.list,})+ const { data: categoryGroupsList } = useQuery({+ queryKey: ['categoryGroups'],+ queryFn: categoryGroupsApi.list,+ })+const { data: accountsList } = useQuery({queryKey: ['accounts'],queryFn: () => accountsApi.list(),@@ -974,6 +980,7 @@ export default function TransactionsPage() {}}accounts={accountsList ?? []}categories={categoriesList ?? []}+ categoryGroups={categoryGroupsList ?? []}payees={payeesList ?? []}groups={allGroups ?? []}/>@@ -1135,23 +1142,21 @@ export default function TransactionsPage() {<div className="w-px bg-border/60 self-stretch" />{/* Categorize — fires on selection, no separate Apply button */}- <select- className="rounded-lg px-3 py-2 text-sm bg-transparent text-foreground hover:bg-muted/60 focus:outline-none focus-visible:bg-muted/60 cursor-pointer w-44 md:w-56"+ <CategorySelectvalue={bulkCategory}- onChange={(e) => {- const next = e.target.value+ onChange={(next) => {setBulkCategory(next)if (next) {bulkCategorizeMutation.mutate({ ids: Array.from(selectedIds), categoryId: next })}}}+ categories={categoriesList ?? []}+ groups={categoryGroupsList ?? []}+ placeholder={t('transactions.selectCategory')}disabled={bulkCategorizeMutation.isPending}- >- <option value="">{t('transactions.selectCategory')}</option>- {categoriesList?.map((cat) => (- <option key={cat.id} value={cat.id}>{cat.name}</option>- ))}- </select>+ className="w-44 md:w-56 h-auto py-2 border-transparent bg-transparent hover:bg-muted/60 focus:bg-muted/60 focus-visible:ring-0"+ contentProps={{ side: 'top', sideOffset: 8 }}+ /><div className="w-px bg-border/60 self-stretch" />@@ -1283,6 +1288,7 @@ export default function TransactionsPage() {duplicateDraft={duplicateDraft}formResetKey={formResetKey}categories={categoriesList ?? []}+ categoryGroups={categoryGroupsList ?? []}accounts={accountsList ?? []}recurringMatch={editingTx ? recurringList?.find(r => r.description === editingTx.description && r.type === editingTx.type) : undefined}onSave={handleTransactionSave}