Skip to content

Open-source personal finance manager. Self-hosted, privacy-first.

fix(frontend): correct mobile interface layouts (#476)

Marlon Passos758ae95ab484
diff --git a/frontend/src/components/account-page-actions.tsx b/frontend/src/components/account-page-actions.tsx
new file mode 100644
index 00000000..66aef782
--- /dev/null
+++ b/frontend/src/components/account-page-actions.tsx
@@ -0,0 +1,69 @@
+import { Layers, MoreHorizontal, Plus } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import { Button } from '@/components/ui/button'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+
+export type AccountPageActionsProps = {
+ canWrite: boolean
+ onAddAccount: () => void
+ onConnectBank: () => void
+ onOpenCollections: () => void
+ testId?: string
+}
+
+function DesktopSecondaryActions(props: AccountPageActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <>
+ <Button variant="outline" className="hidden gap-1.5 sm:inline-flex" onClick={props.onOpenCollections}>
+ <Layers size={16} />
+ {t('collections.title')}
+ </Button>
+ {props.canWrite && (
+ <Button variant="outline" className="hidden gap-1.5 sm:inline-flex" onClick={props.onConnectBank}>
+ <Plus size={16} />
+ {t('accounts.connectBank')}
+ </Button>
+ )}
+ </>
+ )
+}
+
+function MobileSecondaryMenu(props: AccountPageActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="outline" size="icon" className="size-9 shrink-0 sm:hidden" aria-label={t('common.more')}>
+ <MoreHorizontal size={18} />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem onSelect={props.onOpenCollections}>
+ <Layers size={16} />{t('collections.title')}
+ </DropdownMenuItem>
+ {props.canWrite && <DropdownMenuItem onSelect={props.onConnectBank}><Plus size={16} />{t('accounts.connectBank')}</DropdownMenuItem>}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
+
+/**
+ * Preserves the primary Add Account action while moving secondary mobile actions into a menu.
+ * @example `<AccountPageActions canWrite onAddAccount={openForm} onConnectBank={connect} onOpenCollections={openCollections} />`
+ */
+export function AccountPageActions(props: AccountPageActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <div className="flex w-full items-center gap-2 sm:w-auto" data-testid={props.testId}>
+ <DesktopSecondaryActions {...props} />
+ {props.canWrite && <Button onClick={props.onAddAccount} className="flex-1 gap-1.5 sm:flex-none"><Plus size={16} />{t('accounts.addManual')}</Button>}
+ <MobileSecondaryMenu {...props} />
+ </div>
+ )
+}
diff --git a/frontend/src/components/account-row-actions.tsx b/frontend/src/components/account-row-actions.tsx
new file mode 100644
index 00000000..e48c45e4
--- /dev/null
+++ b/frontend/src/components/account-row-actions.tsx
@@ -0,0 +1,137 @@
+import type { MouseEvent } from 'react'
+import type { TFunction } from 'i18next'
+import { Archive, MoreHorizontal, Pencil, Trash2, type LucideIcon } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+
+type AccountActionTone = 'default' | 'warning' | 'destructive'
+
+type AccountAction = {
+ label: string
+ icon: LucideIcon
+ run: () => void
+ tone: AccountActionTone
+}
+
+export type AccountRowActionsProps = {
+ accountName: string
+ onEdit: () => void
+ onClose: () => void
+ onDelete?: () => void
+ deletePending: boolean
+}
+
+function buildAccountActions(t: TFunction, props: AccountRowActionsProps) {
+ const actions: AccountAction[] = [
+ { label: t('common.edit'), icon: Pencil, run: props.onEdit, tone: 'default' },
+ { label: t('accounts.close'), icon: Archive, run: props.onClose, tone: 'warning' },
+ ]
+ if (!props.onDelete) return actions
+ actions.push({
+ label: t('common.delete'),
+ icon: Trash2,
+ run: props.onDelete,
+ tone: 'destructive',
+ })
+ return actions
+}
+
+function accountActionClass(tone: AccountActionTone) {
+ if (tone === 'destructive')
+ return 'rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-rose-50 hover:text-rose-500'
+ if (tone === 'warning')
+ return 'rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-amber-50 hover:text-amber-600'
+ return 'rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground'
+}
+
+function DesktopActionButton({ action, deletePending }: {
+ action: AccountAction
+ deletePending: boolean
+}) {
+ const runAction = (event: MouseEvent<HTMLButtonElement>) => {
+ event.preventDefault()
+ action.run()
+ }
+ return (
+ <button
+ type="button"
+ className={accountActionClass(action.tone)}
+ onClick={runAction}
+ disabled={action.tone === 'destructive' && deletePending}
+ title={action.label}
+ >
+ <action.icon size={13} />
+ </button>
+ )
+}
+
+function DesktopAccountActions({ actions, deletePending }: {
+ actions: AccountAction[]
+ deletePending: boolean
+}) {
+ return (
+ <div className="ml-2 hidden items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100 sm:flex">
+ {actions.map((action) => (
+ <DesktopActionButton key={action.label} action={action} deletePending={deletePending} />
+ ))}
+ </div>
+ )
+}
+
+function MobileActionItem({ action, deletePending }: {
+ action: AccountAction
+ deletePending: boolean
+}) {
+ return (
+ <DropdownMenuItem
+ variant={action.tone === 'destructive' ? 'destructive' : 'default'}
+ disabled={action.tone === 'destructive' && deletePending}
+ onSelect={action.run}
+ >
+ <action.icon size={14} />
+ {action.label}
+ </DropdownMenuItem>
+ )
+}
+
+function MobileAccountActions({ accountName, actions, deletePending }: {
+ accountName: string
+ actions: AccountAction[]
+ deletePending: boolean
+}) {
+ const { t } = useTranslation()
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button type="button" className="ml-1 rounded-md p-2 text-muted-foreground hover:bg-muted hover:text-foreground sm:hidden" aria-label={`${t('common.more')}: ${accountName}`}>
+ <MoreHorizontal size={16} />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ {actions.map((action) => (
+ <MobileActionItem key={action.label} action={action} deletePending={deletePending} />
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
+
+/**
+ * Keeps account edit/close/delete actions available on pointer and touch layouts.
+ * @example `<AccountRowActions accountName="Cash" onEdit={edit} onClose={close} deletePending={false} />`
+ */
+export function AccountRowActions(props: AccountRowActionsProps) {
+ const { t } = useTranslation()
+ const actions = buildAccountActions(t, props)
+ return (
+ <>
+ <DesktopAccountActions actions={actions} deletePending={props.deletePending} />
+ <MobileAccountActions {...props} actions={actions} />
+ </>
+ )
+}
diff --git a/frontend/src/components/link-transfer-dialog.tsx b/frontend/src/components/link-transfer-dialog.tsx
index afb3c622..66f9ffef 100644
--- a/frontend/src/components/link-transfer-dialog.tsx
+++ b/frontend/src/components/link-transfer-dialog.tsx
@@ -7,6 +7,7 @@ import { Button } from '@/components/ui/button'
import {
Dialog,
DialogContent,
+ DialogDescription,
DialogHeader,
DialogTitle,
DialogFooter,
@@ -35,7 +36,7 @@ type CounterpartCardProps = {
function CounterpartCard({ label, description, account, date, amount, currency, sign, locale, dateLocale }: CounterpartCardProps) {
const colorClass = sign === '+' ? 'text-emerald-600' : 'text-rose-500'
return (
- <div className="rounded-lg border border-border bg-muted/30 p-3">
+ <div className="min-w-0 rounded-lg border border-border bg-muted/30 p-3">
<p className="text-[10px] font-semibold uppercase tracking-wide text-muted-foreground mb-1">
{label}
</p>
@@ -166,15 +167,15 @@ export function LinkTransferDialog({
return (
<Dialog open={open} onOpenChange={onClose}>
- <DialogContent className="sm:max-w-xl overflow-hidden">
+ <DialogContent className="max-h-[calc(100dvh-2rem)] grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden p-4 sm:max-w-xl sm:p-6">
<DialogHeader>
<DialogTitle>{t('transactions.linkTransferPickerTitle')}</DialogTitle>
</DialogHeader>
- <div className="space-y-4 min-w-0">
- <p className="text-sm text-muted-foreground">
+ <div className="min-h-0 min-w-0 space-y-4 overflow-y-auto overscroll-contain pr-1">
+ <DialogDescription>
{t('transactions.linkTransferPickerDescription')}
- </p>
+ </DialogDescription>
<CounterpartCard
label={t('transactions.linkTransferAnchor')}
@@ -291,7 +292,7 @@ export function LinkTransferDialog({
)}
</div>
- <DialogFooter>
+ <DialogFooter className="shrink-0">
<Button type="button" variant="outline" onClick={onClose} disabled={loading}>
{t('common.cancel')}
</Button>
@@ -313,17 +314,17 @@ export function LinkTransferDialog({
return (
<Dialog open={open} onOpenChange={onClose}>
- <DialogContent className="sm:max-w-lg">
+ <DialogContent className="max-h-[calc(100dvh-2rem)] grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden p-4 sm:max-w-lg sm:p-6">
<DialogHeader>
<DialogTitle>{t('transactions.linkTransferTitle')}</DialogTitle>
</DialogHeader>
- <div className="space-y-4">
- <p className="text-sm text-muted-foreground">
+ <div className="min-h-0 space-y-4 overflow-y-auto overscroll-contain pr-1">
+ <DialogDescription>
{t('transactions.linkTransferDescription')}
- </p>
+ </DialogDescription>
- <div className="grid grid-cols-[1fr_auto_1fr] items-stretch gap-3">
+ <div className="grid grid-cols-1 items-stretch gap-2 sm:grid-cols-[1fr_auto_1fr] sm:gap-3">
<CounterpartCard
label={t('transactions.linkTransferFrom')}
description={effectiveDebit.description}
@@ -335,8 +336,8 @@ export function LinkTransferDialog({
locale={locale}
dateLocale={dateLocale}
/>
- <div className="flex items-center">
- <ArrowRight size={18} className="text-muted-foreground" />
+ <div className="flex items-center justify-center">
+ <ArrowRight size={18} className="rotate-90 text-muted-foreground sm:rotate-0" />
</div>
<CounterpartCard
label={t('transactions.linkTransferTo')}
@@ -364,7 +365,7 @@ export function LinkTransferDialog({
</div>
</div>
- <DialogFooter className="gap-2 sm:gap-2">
+ <DialogFooter className="shrink-0 gap-2 sm:gap-2">
{isPickerMode && (
<Button
type="button"
diff --git a/frontend/src/components/mobile-bulk-selection-actions.tsx b/frontend/src/components/mobile-bulk-selection-actions.tsx
new file mode 100644
index 00000000..1a80f39c
--- /dev/null
+++ b/frontend/src/components/mobile-bulk-selection-actions.tsx
@@ -0,0 +1,142 @@
+import type { Category, CategoryGroup } from '@/types'
+import { ArrowLeftRight, Check, MoreHorizontal, SlidersHorizontal, Users, X } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import { CategorySelect } from '@/components/category-select'
+import { Button } from '@/components/ui/button'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+
+export type MobileBulkSelectionActionsProps = {
+ selectedCount: number
+ categoryValue: string
+ categories: Category[]
+ categoryGroups: CategoryGroup[]
+ categoryPending: boolean
+ groupPending: boolean
+ tagInput: string
+ addTagsPending: boolean
+ removeTagsPending: boolean
+ transferDisabled: boolean
+ transferTitle: string
+ onCategoryChange: (value: string) => void
+ onOpenGroup: () => void
+ onOpenTransfer: () => void
+ onCreateRule?: () => void
+ onTagInputChange: (value: string) => void
+ onAddTags: (tags: string[]) => void
+ onRemoveTags: (tags: string[]) => void
+ onClear: () => void
+}
+
+function parseBulkTags(value: string) {
+ return value.trim().split(/[\s,]+/).filter(Boolean)
+}
+
+function BulkCategoryPicker(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <div className="min-w-0 flex-1">
+ <CategorySelect
+ key={`mobile-${props.categoryValue}`}
+ value={props.categoryValue}
+ onChange={props.onCategoryChange}
+ categories={props.categories}
+ groups={props.categoryGroups}
+ placeholder={t('transactions.selectCategory')}
+ disabled={props.categoryPending}
+ className="h-9 min-w-0 border-transparent bg-transparent px-2 shadow-none hover:bg-muted/60 focus:bg-muted/60 focus-visible:ring-0"
+ contentProps={{ side: 'top', sideOffset: 8 }}
+ />
+ </div>
+ )
+}
+
+function BulkTagButtons(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ const tags = parseBulkTags(props.tagInput)
+ return (
+ <div className="mt-1.5 grid grid-cols-2 gap-1.5">
+ <Button size="sm" variant="ghost" disabled={!tags.length || props.addTagsPending} onClick={() => props.onAddTags(tags)}>
+ <Check size={15} />{t('transactions.bulkAddTags', 'Add tags')}
+ </Button>
+ <Button size="sm" variant="ghost" disabled={!tags.length || props.removeTagsPending} onClick={() => props.onRemoveTags(tags)}>
+ <X size={15} />{t('transactions.bulkRemoveTags', 'Remove tags')}
+ </Button>
+ </div>
+ )
+}
+
+function BulkTagEditor(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ const submitTags = () => {
+ const tags = parseBulkTags(props.tagInput)
+ if (tags.length) props.onAddTags(tags)
+ }
+ return (
+ <div className="mt-1 border-t border-border px-2 pt-2">
+ <input
+ type="text"
+ value={props.tagInput}
+ onChange={(event) => props.onTagInputChange(event.target.value)}
+ placeholder={t('transactions.addTagsPlaceholder', '#tag…')}
+ className="h-9 w-full rounded-md border border-input bg-transparent px-2.5 text-sm text-foreground outline-none placeholder:text-muted-foreground focus:border-ring"
+ onKeyDown={(event) => { event.stopPropagation(); if (event.key === 'Enter') { event.preventDefault(); submitTags() } }}
+ />
+ <BulkTagButtons {...props} />
+ </div>
+ )
+}
+
+function BulkActionItems(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <>
+ <DropdownMenuItem disabled={props.groupPending} onSelect={props.onOpenGroup}>
+ <Users size={15} />{t('transactions.addToGroup')}
+ </DropdownMenuItem>
+ <DropdownMenuItem disabled={props.transferDisabled} title={props.transferTitle} onSelect={props.onOpenTransfer}>
+ <ArrowLeftRight size={15} />{t('transactions.linkAsTransfer')}
+ </DropdownMenuItem>
+ {props.onCreateRule && <DropdownMenuItem onSelect={props.onCreateRule}><SlidersHorizontal size={15} />{t('transactions.createRule')}</DropdownMenuItem>}
+ <BulkTagEditor {...props} />
+ </>
+ )
+}
+
+function BulkActionsMenu(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="ghost" size="sm" className="h-9 shrink-0 px-2.5">
+ <MoreHorizontal size={16} />{t('rules.actions')}
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="top" align="end" sideOffset={8} className="w-64">
+ <BulkActionItems {...props} />
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
+
+/**
+ * Exposes bulk count, categorization, secondary actions, and close control on mobile.
+ * @example `<MobileBulkSelectionActions selectedCount={2} {...bulkActionProps} />`
+ */
+export function MobileBulkSelectionActions(props: MobileBulkSelectionActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <div className="flex w-full items-center gap-1.5 sm:hidden">
+ <span className="inline-flex size-8 shrink-0 items-center justify-center rounded-full bg-primary/10 text-xs font-semibold text-primary">{props.selectedCount}</span>
+ <BulkCategoryPicker {...props} />
+ <BulkActionsMenu {...props} />
+ <button type="button" onClick={props.onClear} className="shrink-0 rounded-lg p-2 text-muted-foreground hover:bg-muted/60 hover:text-foreground" aria-label={t('common.close', 'Close')}>
+ <X size={16} />
+ </button>
+ </div>
+ )
+}
diff --git a/frontend/src/components/mobile-transactions-filter-menu.tsx b/frontend/src/components/mobile-transactions-filter-menu.tsx
new file mode 100644
index 00000000..3d5e3dab
--- /dev/null
+++ b/frontend/src/components/mobile-transactions-filter-menu.tsx
@@ -0,0 +1,531 @@
+import type { ComponentType, Dispatch, SetStateAction } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+ ArrowUpDown,
+ Calendar as CalendarIcon,
+ Check,
+ ChevronLeft,
+ ChevronRight,
+ Coins,
+ Store,
+ Tag,
+ Users,
+ Wallet,
+ X,
+} from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { CategoryFilterContent } from '@/components/category-filter-content'
+import {
+ DropdownMenuCheckboxItem,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+} from '@/components/ui/dropdown-menu'
+import { getAccountName } from '@/lib/account-utils'
+import { cn } from '@/lib/utils'
+import type { Account, Category, CategoryGroup, Group, Payee } from '@/types'
+
+export type MobileFilterView =
+ | 'root'
+ | 'account'
+ | 'category'
+ | 'payee'
+ | 'group'
+ | 'type'
+ | 'date'
+ | 'amount'
+
+export interface MobileDatePreset {
+ key: string
+ label: string
+ from: string
+ to: string
+}
+
+interface MobileTransactionsFilterMenuProps {
+ view: MobileFilterView
+ setView: Dispatch<SetStateAction<MobileFilterView>>
+ setMenuOpen: (open: boolean) => void
+ accounts: Account[]
+ categories: Category[]
+ categoryGroups: CategoryGroup[]
+ payees: Payee[]
+ groups: Group[]
+ accountIds: string[]
+ categoryIds: string[]
+ uncategorized: boolean
+ payeeId: string
+ groupId: string
+ type: string
+ from: string
+ to: string
+ minAmount: string
+ maxAmount: string
+ appliedMinAmount: string
+ appliedMaxAmount: string
+ setMinAmount: (value: string) => void
+ setMaxAmount: (value: string) => void
+ summaries: Record<Exclude<MobileFilterView, 'root'>, string | null | undefined>
+ datePresets: MobileDatePreset[]
+ hasAnyFilter: boolean
+ onAccountIdsChange: (value: string[]) => void
+ onCategoryIdsChange: (value: string[]) => void
+ onUncategorizedChange: (value: boolean) => void
+ onPayeeChange: (value: string) => void
+ onGroupIdChange: (value: string) => void
+ onTypeChange: (value: string) => void
+ onDateRangeChange: (from: string, to: string) => void
+ onAmountRangeChange: (min: string, max: string) => void
+ onApplyAmountRange: () => void
+ onOpenCustomRange: () => void
+ onClearAll: () => void
+}
+
+interface RootOption {
+ view: Exclude<MobileFilterView, 'root'>
+ icon: ComponentType<{ size?: number; className?: string }>
+ label: string
+ summary?: string | null
+}
+
+interface SelectionOption {
+ value: string
+ label: string
+}
+
+function toggleSelection(selectedIds: string[], id: string): string[] {
+ return selectedIds.includes(id)
+ ? selectedIds.filter((selectedId) => selectedId !== id)
+ : [...selectedIds, id]
+}
+
+function MobileRootOption({
+ option,
+ onSelect,
+}: {
+ option: RootOption
+ onSelect: (view: RootOption['view']) => void
+}) {
+ const Icon = option.icon
+ return (
+ <DropdownMenuItem
+ onSelect={(event) => {
+ event.preventDefault()
+ onSelect(option.view)
+ }}
+ className="gap-2 py-2 text-[13px]"
+ >
+ <Icon size={14} className="text-muted-foreground" />
+ <span className="flex-1">{option.label}</span>
+ {option.summary && (
+ <span className="max-w-24 truncate text-[11px] text-muted-foreground">
+ {option.summary}
+ </span>
+ )}
+ <ChevronRight size={13} className="text-muted-foreground/60" />
+ </DropdownMenuItem>
+ )
+}
+
+function MobileFilterRoot({
+ options,
+ hasAnyFilter,
+ onSelect,
+ onClear,
+}: {
+ options: RootOption[]
+ hasAnyFilter: boolean
+ onSelect: (view: RootOption['view']) => void
+ onClear: () => void
+}) {
+ const { t } = useTranslation()
+ return (
+ <>
+ <DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">
+ {t('transactions.filtersBar.filterBy')}
+ </DropdownMenuLabel>
+ {options.map((option) => (
+ <MobileRootOption key={option.view} option={option} onSelect={onSelect} />
+ ))}
+ {hasAnyFilter && <MobileClearFilters onClear={onClear} />}
+ </>
+ )
+}
+
+function MobileClearFilters({ onClear }: { onClear: () => void }) {
+ const { t } = useTranslation()
+ return (
+ <>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onSelect={onClear}
+ className="gap-2 text-[12.5px] text-muted-foreground"
+ >
+ <X size={13} />
+ {t('transactions.clearFilters')}
+ </DropdownMenuItem>
+ </>
+ )
+}
+
+function MobileDetailHeader({
+ title,
+ onBack,
+}: {
+ title: string
+ onBack: () => void
+}) {
+ const { t } = useTranslation()
+ return (
+ <>
+ <button
+ type="button"
+ onClick={onBack}
+ className="flex w-full items-center gap-1 rounded-sm px-2 py-1.5 text-left text-xs font-medium text-muted-foreground hover:bg-muted hover:text-foreground"
+ >
+ <ChevronLeft size={14} />
+ {t('common.back')}
+ </button>
+ <DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">
+ {title}
+ </DropdownMenuLabel>
+ </>
+ )
+}
+
+function MobileAccountOption({
+ account,
+ checked,
+ onChange,
+}: {
+ account: Account
+ checked: boolean
+ onChange: () => void
+}) {
+ return (
+ <DropdownMenuCheckboxItem
+ checked={checked}
+ onSelect={(event) => {
+ event.preventDefault()
+ onChange()
+ }}
+ className="gap-2 py-2 text-[13px]"
+ >
+ <span className="min-w-0 flex-1 truncate text-left">
+ {getAccountName(account)}
+ </span>
+ {account.currency && (
+ <span className="text-[10.5px] uppercase tracking-wide text-muted-foreground/70">
+ {account.currency}
+ </span>
+ )}
+ </DropdownMenuCheckboxItem>
+ )
+}
+
+function MobileAccountView({
+ accounts,
+ selectedIds,
+ onChange,
+}: {
+ accounts: Account[]
+ selectedIds: string[]
+ onChange: (value: string[]) => void
+}) {
+ const { t } = useTranslation()
+ if (accounts.length === 0) {
+ return <MobileEmptyOptions />
+ }
+ return (
+ <>
+ {accounts.map((account) => (
+ <MobileAccountOption
+ key={account.id}
+ account={account}
+ checked={selectedIds.includes(account.id)}
+ onChange={() => onChange(toggleSelection(selectedIds, account.id))}
+ />
+ ))}
+ {selectedIds.length > 0 && (
+ <DropdownMenuItem
+ onSelect={(event) => {
+ event.preventDefault()
+ onChange([])
+ }}
+ className="mt-1 gap-2 border-t border-border/60 text-xs text-muted-foreground"
+ >
+ <X size={12} />
+ {t('transactions.filtersBar.clearSelection')}
+ </DropdownMenuItem>
+ )}
+ </>
+ )
+}
+
+function MobileEmptyOptions() {
+ const { t } = useTranslation()
+ return (
+ <div className="px-2 py-3 text-center text-xs text-muted-foreground">
+ {t('transactions.filtersBar.noOptions')}
+ </div>
+ )
+}
+
+function MobileSelectionView({
+ options,
+ selectedValue,
+ onChange,
+}: {
+ options: SelectionOption[]
+ selectedValue: string
+ onChange: (value: string) => void
+}) {
+ return options.map((option) => (
+ <DropdownMenuItem
+ key={option.value || 'all'}
+ onSelect={(event) => {
+ event.preventDefault()
+ onChange(option.value)
+ }}
+ className={cn(
+ 'gap-2 py-2 text-[13px]',
+ selectedValue === option.value && 'bg-primary/5',
+ )}
+ >
+ <span className="min-w-0 flex-1 truncate">{option.label}</span>
+ {selectedValue === option.value && <Check size={13} className="text-primary" />}
+ </DropdownMenuItem>
+ ))
+}
+
+function MobileDateView({
+ from,
+ to,
+ presets,
+ onChange,
+ onOpenCustomRange,
+}: {
+ from: string
+ to: string
+ presets: MobileDatePreset[]
+ onChange: (from: string, to: string) => void
+ onOpenCustomRange: () => void
+}) {
+ const { t } = useTranslation()
+ const options = [
+ { value: '|', label: t('transactions.all') },
+ ...presets.map((preset) => ({
+ value: `${preset.from}|${preset.to}`,
+ label: preset.label,
+ })),
+ ]
+ return (
+ <>
+ <MobileSelectionView
+ options={options}
+ selectedValue={`${from}|${to}`}
+ onChange={(value) => onChange(...splitDateRange(value))}
+ />
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ onSelect={onOpenCustomRange}
+ className="justify-between py-2 text-[13px]"
+ >
+ {t('transactions.filtersBar.customRange')}
+ <ChevronRight size={13} className="text-muted-foreground/60" />
+ </DropdownMenuItem>
+ </>
+ )
+}
+
+function splitDateRange(value: string): [string, string] {
+ const [from, to] = value.split('|')
+ return [from, to]
+}
+
+function MobileAmountField({
+ label,
+ value,
+ onChange,
+}: {
+ label: string
+ value: string
+ onChange: (value: string) => void
+}) {
+ return (
+ <label className="text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/80">
+ {label}
+ <input
+ type="number"
+ inputMode="decimal"
+ min={0}
+ step="0.01"
+ placeholder="0.00"
+ value={value}
+ onChange={(event) => onChange(event.target.value)}
+ className="mt-1 h-9 w-full rounded-md border border-border bg-background px-2 text-[13px] font-normal tracking-normal text-foreground outline-none focus:border-primary/60"
+ />
+ </label>
+ )
+}
+
+function MobileAmountView({
+ minAmount,
+ maxAmount,
+ setMinAmount,
+ setMaxAmount,
+ onReset,
+ onApply,
+}: {
+ minAmount: string
+ maxAmount: string
+ setMinAmount: (value: string) => void
+ setMaxAmount: (value: string) => void
+ onReset: () => void
+ onApply: () => void
+}) {
+ const { t } = useTranslation()
+ return (
+ <div className="p-2">
+ <div className="grid grid-cols-2 gap-2">
+ <MobileAmountField
+ label={t('transactions.filtersBar.amountMinLabel')}
+ value={minAmount}
+ onChange={setMinAmount}
+ />
+ <MobileAmountField
+ label={t('transactions.filtersBar.amountMaxLabel')}
+ value={maxAmount}
+ onChange={setMaxAmount}
+ />
+ </div>
+ <p className="mt-2 text-[10.5px] leading-snug text-muted-foreground/80">
+ {t('transactions.filtersBar.amountHint')}
+ </p>
+ <div className="mt-2 flex items-center justify-between gap-2">
+ <button
+ type="button"
+ onClick={onReset}
+ className="text-xs font-medium text-muted-foreground hover:text-foreground"
+ >
+ {t('transactions.filtersBar.reset')}
+ </button>
+ <Button
+ type="button"
+ size="sm"
+ disabled={!minAmount && !maxAmount}
+ onClick={onApply}
+ >
+ {t('transactions.filtersBar.apply')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+function buildRootOptions(
+ labels: Record<Exclude<MobileFilterView, 'root'>, string>,
+ summaries: MobileTransactionsFilterMenuProps['summaries'],
+): RootOption[] {
+ return [
+ { view: 'account', icon: Wallet, label: labels.account, summary: summaries.account },
+ { view: 'category', icon: Tag, label: labels.category, summary: summaries.category },
+ { view: 'payee', icon: Store, label: labels.payee, summary: summaries.payee },
+ { view: 'group', icon: Users, label: labels.group, summary: summaries.group },
+ { view: 'type', icon: ArrowUpDown, label: labels.type, summary: summaries.type },
+ { view: 'date', icon: CalendarIcon, label: labels.date, summary: summaries.date },
+ { view: 'amount', icon: Coins, label: labels.amount, summary: summaries.amount },
+ ]
+}
+
+function buildLabels(
+ t: ReturnType<typeof useTranslation>['t'],
+): Record<Exclude<MobileFilterView, 'root'>, string> {
+ return {
+ account: t('transactions.account'),
+ category: t('transactions.category'),
+ payee: t('payees.payee'),
+ group: t('splitGroups.group'),
+ type: t('transactions.type'),
+ date: t('transactions.filtersBar.date'),
+ amount: t('transactions.filtersBar.amount'),
+ }
+}
+
+function MobileFilterDetail({
+ menu,
+ labels,
+}: {
+ menu: MobileTransactionsFilterMenuProps
+ labels: Record<Exclude<MobileFilterView, 'root'>, string>
+}) {
+ const { t } = useTranslation()
+ const allOption = { value: '', label: t('transactions.all') }
+ if (menu.view === 'account') {
+ return <MobileAccountView accounts={menu.accounts} selectedIds={menu.accountIds} onChange={menu.onAccountIdsChange} />
+ }
+ if (menu.view === 'category') {
+ return <CategoryFilterContent categoryIds={menu.categoryIds} onCategoryIdsChange={menu.onCategoryIdsChange} filterUncategorized={menu.uncategorized} onUncategorizedChange={menu.onUncategorizedChange} categories={menu.categories} groups={menu.categoryGroups} onKeepOpen={() => undefined} />
+ }
+ if (menu.view === 'payee') {
+ return <MobileSelectionView options={[allOption, ...menu.payees.map(({ id, name }) => ({ value: id, label: name }))]} selectedValue={menu.payeeId} onChange={menu.onPayeeChange} />
+ }
+ if (menu.view === 'group') {
+ return <MobileSelectionView options={[allOption, ...menu.groups.map(({ id, name }) => ({ value: id, label: name }))]} selectedValue={menu.groupId} onChange={menu.onGroupIdChange} />
+ }
+ if (menu.view === 'type') {
+ const options = [allOption, { value: 'credit', label: t('transactions.income') }, { value: 'debit', label: t('transactions.expense') }]
+ return <MobileSelectionView options={options} selectedValue={menu.type} onChange={menu.onTypeChange} />
+ }
+ if (menu.view === 'date') {
+ return <MobileDateView from={menu.from} to={menu.to} presets={menu.datePresets} onChange={menu.onDateRangeChange} onOpenCustomRange={menu.onOpenCustomRange} />
+ }
+ if (menu.view === 'amount') {
+ return <MobileAmountView minAmount={menu.minAmount} maxAmount={menu.maxAmount} setMinAmount={menu.setMinAmount} setMaxAmount={menu.setMaxAmount} onReset={() => resetAmount(menu)} onApply={menu.onApplyAmountRange} />
+ }
+ return <MobileFilterRoot options={buildRootOptions(labels, menu.summaries)} hasAnyFilter={menu.hasAnyFilter} onSelect={(view) => openDetail(menu, view)} onClear={() => clearAll(menu)} />
+}
+
+function openDetail(
+ menu: MobileTransactionsFilterMenuProps,
+ view: Exclude<MobileFilterView, 'root'>,
+) {
+ if (view === 'amount') {
+ menu.setMinAmount(menu.appliedMinAmount)
+ menu.setMaxAmount(menu.appliedMaxAmount)
+ }
+ menu.setView(view)
+}
+
+function resetAmount(menu: MobileTransactionsFilterMenuProps) {
+ menu.setMinAmount('')
+ menu.setMaxAmount('')
+ menu.onAmountRangeChange('', '')
+}
+
+function clearAll(menu: MobileTransactionsFilterMenuProps) {
+ menu.onClearAll()
+ menu.setMenuOpen(false)
+}
+
+/**
+ * Keeps mobile transaction filters inside one navigable dropdown.
+ * @example <MobileTransactionsFilterMenu {...menuProps} />
+ */
+export function MobileTransactionsFilterMenu(
+ menu: MobileTransactionsFilterMenuProps,
+) {
+ const { t } = useTranslation()
+ const labels = buildLabels(t)
+ return (
+ <div className="sm:hidden">
+ {menu.view !== 'root' && (
+ <MobileDetailHeader
+ title={labels[menu.view]}
+ onBack={() => menu.setView('root')}
+ />
+ )}
+ <MobileFilterDetail menu={menu} labels={labels} />
+ </div>
+ )
+}
diff --git a/frontend/src/components/month-stepper.tsx b/frontend/src/components/month-stepper.tsx
index cd106383..f5b3aabe 100644
--- a/frontend/src/components/month-stepper.tsx
+++ b/frontend/src/components/month-stepper.tsx
@@ -24,6 +24,11 @@ interface MonthStepperProps {
export function MonthStepper({ value, onChange, locale = 'pt-BR', prevLabel, nextLabel }: MonthStepperProps) {
const [open, setOpen] = useState(false)
const label = monthLabel(value, locale).replace(/^\w/, (c) => c.toUpperCase())
+ const [year, month] = value.split('-').map(Number)
+ const compactLabel = new Date(year, month - 1, 2).toLocaleDateString(locale, {
+ month: '2-digit',
+ year: 'numeric',
+ })
const dateFnsLocale = resolveDateFnsLocale(locale)
return (
@@ -40,9 +45,12 @@ export function MonthStepper({ value, onChange, locale = 'pt-BR', prevLabel, nex
<PopoverTrigger asChild>
<button
type="button"
- className="inline-flex items-center justify-center border border-border rounded-lg px-3 py-1.5 text-sm bg-card text-foreground min-w-0 sm:min-w-[160px] truncate hover:bg-muted/50 transition-all cursor-pointer"
+ aria-label={label}
+ title={label}
+ className="inline-flex min-w-0 items-center justify-center truncate rounded-lg border border-border bg-card px-2 py-1.5 text-sm text-foreground transition-all hover:bg-muted/50 sm:min-w-[160px] sm:px-3"
>
- {label}
+ <span className="sm:hidden">{compactLabel}</span>
+ <span className="hidden sm:inline">{label}</span>
</button>
</PopoverTrigger>
<PopoverContent align="center" className="w-auto p-0">
@@ -69,4 +77,3 @@ export function MonthStepper({ value, onChange, locale = 'pt-BR', prevLabel, nex
</div>
)
}
-
diff --git a/frontend/src/components/rule-dialog.tsx b/frontend/src/components/rule-dialog.tsx
index 30e492cc..c2bf51dd 100644
--- a/frontend/src/components/rule-dialog.tsx
+++ b/frontend/src/components/rule-dialog.tsx
@@ -152,7 +152,10 @@ export function RuleDialog({
return (
<Dialog open={open} onOpenChange={onClose}>
- <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto overflow-x-hidden">
+ <DialogContent
+ aria-describedby={undefined}
+ className="max-w-2xl max-h-[90vh] overflow-y-auto overflow-x-hidden"
+ >
<DialogHeader>
<DialogTitle>{rule ? t('rules.editRule') : t('rules.newRule')}</DialogTitle>
</DialogHeader>
@@ -191,9 +194,9 @@ export function RuleDialog({
</div>
<div className="space-y-2">
{conditions.map((cond, i) => (
- <div key={i} className="flex items-center gap-2 min-w-0">
+ <div key={i} className="relative grid min-w-0 grid-cols-2 gap-2 pr-7 sm:flex sm:items-center sm:pr-0">
<select
- className={`${selectClass} w-32 shrink-0`}
+ className={`${selectClass} w-full sm:w-32 sm:shrink-0`}
value={cond.field}
onChange={(e) => updateCondition(i, 'field', e.target.value)}
>
@@ -202,7 +205,7 @@ export function RuleDialog({
))}
</select>
<select
- className={`${selectClass} w-32 shrink-0`}
+ className={`${selectClass} w-full sm:w-32 sm:shrink-0`}
value={cond.op}
onChange={(e) => updateCondition(i, 'op', e.target.value)}
>
@@ -212,7 +215,7 @@ export function RuleDialog({
</select>
{cond.field === 'type' ? (
<select
- className={`${selectClass} w-0 flex-1 min-w-0`}
+ className={`${selectClass} col-span-2 w-full min-w-0 sm:w-0 sm:flex-1`}
value={String(cond.value)}
onChange={(e) => updateCondition(i, 'value', e.target.value)}
>
@@ -221,7 +224,7 @@ export function RuleDialog({
</select>
) : cond.field === 'account_id' ? (
<select
- className={`${selectClass} w-0 flex-1 min-w-0`}
+ className={`${selectClass} col-span-2 w-full min-w-0 sm:w-0 sm:flex-1`}
value={String(cond.value)}
onChange={(e) => updateCondition(i, 'value', e.target.value)}
>
@@ -232,7 +235,7 @@ export function RuleDialog({
</select>
) : cond.field === 'payee_id' ? (
<select
- className={`${selectClass} w-0 flex-1 min-w-0`}
+ className={`${selectClass} col-span-2 w-full min-w-0 sm:w-0 sm:flex-1`}
value={String(cond.value)}
onChange={(e) => updateCondition(i, 'value', e.target.value)}
>
@@ -243,7 +246,7 @@ export function RuleDialog({
</select>
) : (
<Input
- className="w-0 flex-1 min-w-0 h-8 text-sm"
+ className="col-span-2 h-8 w-full min-w-0 text-sm sm:w-0 sm:flex-1"
value={String(cond.value)}
onChange={(e) => updateCondition(i, 'value', e.target.value)}
placeholder={cond.field === 'amount' ? '0.00' : cond.field === 'date' ? 'YYYY-MM-DD' : t('rules.valuePlaceholder')}
@@ -252,7 +255,7 @@ export function RuleDialog({
)}
<button
type="button"
- className="p-1 text-muted-foreground hover:text-rose-500 transition-colors shrink-0"
+ className="absolute right-0 top-1 shrink-0 p-1 text-muted-foreground transition-colors hover:text-rose-500 sm:static"
onClick={() => removeCondition(i)}
>
<X size={13} />
@@ -274,9 +277,9 @@ export function RuleDialog({
<Label>{t('rules.actions')}</Label>
<div className="space-y-2">
{actions.map((action, i) => (
- <div key={i} className="flex items-center gap-2 min-w-0">
+ <div key={i} className="relative grid min-w-0 gap-2 pr-7 sm:flex sm:items-center sm:pr-0">
<select
- className={`${selectClass} w-40 shrink-0`}
+ className={`${selectClass} w-full sm:w-40 sm:shrink-0`}
value={action.op}
onChange={(e) => updateAction(i, 'op', e.target.value)}
>
@@ -286,11 +289,11 @@ export function RuleDialog({
<option value="ignore">{t('rules.ignoreAction')}</option>
</select>
{action.op === 'ignore' ? (
- <span className="w-0 flex-1 min-w-0 text-sm text-muted-foreground italic">
+ <span className="min-w-0 text-sm italic text-muted-foreground sm:w-0 sm:flex-1">
{t('rules.ignoreActionHint')}
</span>
) : action.op === 'set_category' ? (
- <div className="w-0 flex-1 min-w-0">
+ <div className="w-full min-w-0 sm:w-0 sm:flex-1">
<CategorySelect
value={action.value}
onChange={(val) => updateAction(i, 'value', val)}
@@ -302,7 +305,7 @@ export function RuleDialog({
</div>
) : action.op === 'set_payee' ? (
<select
- className={`${selectClass} w-0 flex-1 min-w-0`}
+ className={`${selectClass} w-full min-w-0 sm:w-0 sm:flex-1`}
value={action.value}
onChange={(e) => updateAction(i, 'value', e.target.value)}
required
@@ -314,7 +317,7 @@ export function RuleDialog({
</select>
) : (
<Input
- className="w-0 flex-1 min-w-0 h-8 text-sm"
+ className="h-8 w-full min-w-0 text-sm sm:w-0 sm:flex-1"
value={action.value}
onChange={(e) => updateAction(i, 'value', e.target.value)}
placeholder="Ex: #work #reimbursable"
@@ -322,7 +325,7 @@ export function RuleDialog({
)}
<button
type="button"
- className="p-1 text-muted-foreground hover:text-rose-500 transition-colors shrink-0"
+ className="absolute right-0 top-1 shrink-0 p-1 text-muted-foreground transition-colors hover:text-rose-500 sm:static"
onClick={() => removeAction(i)}
>
<X size={13} />
diff --git a/frontend/src/components/transactions-filter-bar.tsx b/frontend/src/components/transactions-filter-bar.tsx
index b26af22d..faa2e14c 100644
--- a/frontend/src/components/transactions-filter-bar.tsx
+++ b/frontend/src/components/transactions-filter-bar.tsx
@@ -42,6 +42,10 @@ import { cn } from '@/lib/utils'
import { localDateString } from '@/lib/date-utils'
import { resolveDateFnsLocale } from '@/lib/date-fns-locale'
import { CategoryFilterContent } from '@/components/category-filter-content'
+import {
+ MobileTransactionsFilterMenu,
+ type MobileFilterView,
+} from '@/components/mobile-transactions-filter-menu'
import type { Account, Category, CategoryGroup, Group, Payee } from '@/types'
interface TransactionsFilterBarProps {
@@ -122,6 +126,7 @@ export function TransactionsFilterBar({
const [amountSubOpen, setAmountSubOpen] = useState(false)
const [draftMinAmount, setDraftMinAmount] = useState<string>(filterMinAmount)
const [draftMaxAmount, setDraftMaxAmount] = useState<string>(filterMaxAmount)
+ const [mobileFilterView, setMobileFilterView] = useState<MobileFilterView>('root')
const searchRef = useRef<HTMLInputElement>(null)
// When a CheckRow is clicked inside a submenu, Radix tries to close the submenu
@@ -148,6 +153,7 @@ export function TransactionsFilterBar({
setAccountSubOpen(false)
setCategorySubOpen(false)
setAmountSubOpen(false)
+ setMobileFilterView('root')
keepAccountSubOpenRef.current = false
keepCategorySubOpenRef.current = false
}
@@ -317,7 +323,6 @@ export function TransactionsFilterBar({
return categoryById.get(filterCategoryIds[0])?.name ?? ''
return ''
})()
-
return (
<div className="mb-4">
<Popover open={dateCustomOpen} onOpenChange={setDateCustomOpen} modal={true}>
@@ -373,8 +378,56 @@ export function TransactionsFilterBar({
<DropdownMenuContent
align="end"
sideOffset={6}
- className="w-[240px] p-1"
+ className="w-[min(18rem,calc(100vw-2rem))] p-1 sm:w-[240px]"
>
+ <MobileTransactionsFilterMenu
+ view={mobileFilterView}
+ setView={setMobileFilterView}
+ setMenuOpen={setMenuOpen}
+ accounts={accounts}
+ categories={categories}
+ categoryGroups={categoryGroups}
+ payees={payees}
+ groups={groups}
+ accountIds={filterAccountIds}
+ categoryIds={filterCategoryIds}
+ uncategorized={filterUncategorized}
+ payeeId={filterPayee}
+ groupId={filterGroupId}
+ type={filterType}
+ from={filterFrom}
+ to={filterTo}
+ minAmount={draftMinAmount}
+ maxAmount={draftMaxAmount}
+ appliedMinAmount={filterMinAmount}
+ appliedMaxAmount={filterMaxAmount}
+ setMinAmount={setDraftMinAmount}
+ setMaxAmount={setDraftMaxAmount}
+ summaries={{
+ account: accountSummary,
+ category: categorySummary,
+ payee: selectedPayee?.name,
+ group: selectedGroup?.name,
+ type: typeLabel,
+ date: dateLabel,
+ amount: amountLabel,
+ }}
+ datePresets={datePresets}
+ hasAnyFilter={hasAnyFilter}
+ onAccountIdsChange={onAccountIdsChange}
+ onCategoryIdsChange={onCategoryIdsChange}
+ onUncategorizedChange={onUncategorizedChange}
+ onPayeeChange={onPayeeChange}
+ onGroupIdChange={onGroupIdChange}
+ onTypeChange={onTypeChange}
+ onDateRangeChange={onDateRangeChange}
+ onAmountRangeChange={onAmountRangeChange}
+ onApplyAmountRange={applyAmountRange}
+ onOpenCustomRange={openCustomRange}
+ onClearAll={onClearAll}
+ />
+
+ <div className="hidden sm:block">
<DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">
{t('transactions.filtersBar.filterBy')}
</DropdownMenuLabel>
@@ -819,6 +872,7 @@ export function TransactionsFilterBar({
</DropdownMenuItem>
</>
)}
+ </div>
</DropdownMenuContent>
</DropdownMenu>
</div>
diff --git a/frontend/src/components/transactions-page-actions.tsx b/frontend/src/components/transactions-page-actions.tsx
new file mode 100644
index 00000000..6419e14d
--- /dev/null
+++ b/frontend/src/components/transactions-page-actions.tsx
@@ -0,0 +1,98 @@
+import type { ReactNode } from 'react'
+import { ArrowLeftRight, Copy, Download, MoreHorizontal } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import { MonthStepper } from '@/components/month-stepper'
+import { Button } from '@/components/ui/button'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+
+type MonthStepperConfig = {
+ value: string
+ onChange: (value: string) => void
+ locale: string
+ prevLabel: string
+ nextLabel: string
+}
+
+export type TransactionsPageActionsProps = {
+ month: MonthStepperConfig
+ columnPicker: ReactNode
+ exportLabel: string
+ exporting: boolean
+ onExport: () => void
+ onAdd?: () => void
+ onDuplicate?: () => void
+ onTransfer?: () => void
+ testId?: string
+}
+
+function HeaderMonthStepper({ month }: { month: MonthStepperConfig }) {
+ return (
+ <div className="min-w-0 flex-1 sm:flex-none">
+ <MonthStepper {...month} />
+ </div>
+ )
+}
+
+function DesktopSecondaryActions(props: TransactionsPageActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <div className="hidden sm:contents">
+ {props.columnPicker}
+ <Button variant="outline" disabled={props.exporting} onClick={props.onExport}>
+ <Download size={16} className="mr-1.5" />{props.exportLabel}
+ </Button>
+ {props.onDuplicate && <Button variant="outline" onClick={props.onDuplicate}><Copy size={16} className="mr-1.5" />{t('transactions.duplicate')}</Button>}
+ {props.onTransfer && <Button variant="outline" onClick={props.onTransfer}><ArrowLeftRight size={16} className="mr-1.5" />{t('transactions.transfer')}</Button>}
+ </div>
+ )
+}
+
+function PrimaryAddAction({ onAdd }: { onAdd?: () => void }) {
+ const { t } = useTranslation()
+ if (!onAdd) return null
+ return (
+ <Button className="shrink-0 px-3" onClick={onAdd}>
+ + <span className="sm:hidden">{t('common.add')}</span>
+ <span className="hidden sm:inline">{t('transactions.addManual')}</span>
+ </Button>
+ )
+}
+
+function MobileSecondaryMenu(props: TransactionsPageActionsProps) {
+ const { t } = useTranslation()
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="outline" size="icon" className="!size-9 sm:hidden" aria-label={t('common.more')}>
+ <MoreHorizontal size={18} />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem disabled={props.exporting} onClick={props.onExport}><Download size={16} className="mr-2" />{props.exportLabel}</DropdownMenuItem>
+ {props.onDuplicate && <DropdownMenuItem onClick={props.onDuplicate}><Copy size={16} className="mr-2" />{t('transactions.duplicate')}</DropdownMenuItem>}
+ {props.onTransfer && <DropdownMenuItem onClick={props.onTransfer}><ArrowLeftRight size={16} className="mr-2" />{t('transactions.transfer')}</DropdownMenuItem>}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
+
+/**
+ * Keeps month, primary transaction action, and mobile overflow on one compact row.
+ * @example `<TransactionsPageActions month={month} columnPicker={picker} exportLabel="Export" exporting={false} onExport={exportCsv} />`
+ */
+export function TransactionsPageActions(props: TransactionsPageActionsProps) {
+ // Secondary actions stay labelled on desktop and collapse only where width is scarce.
+ return (
+ <div className="flex w-full min-w-0 items-center gap-2 sm:w-auto sm:flex-wrap sm:justify-end" data-testid={props.testId}>
+ <HeaderMonthStepper month={props.month} />
+ <DesktopSecondaryActions {...props} />
+ <PrimaryAddAction onAdd={props.onAdd} />
+ <MobileSecondaryMenu {...props} />
+ </div>
+ )
+}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0284d94d..a0fafa90 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Ansehen",
+ "add": "Hinzufügen",
"save": "Speichern",
"saving": "Wird gespeichert…",
"cancel": "Abbrechen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index b1b2623b..e26de9cf 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "View",
+ "add": "Add",
"save": "Save",
"saving": "Saving…",
"cancel": "Cancel",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 6441218f..7732332a 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Ver",
+ "add": "Añadir",
"save": "Guardar",
"saving": "Guardando…",
"cancel": "Cancelar",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 968994c5..ca0f0712 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Voir",
+ "add": "Ajouter",
"save": "Enregistrer",
"saving": "Enregistrement…",
"cancel": "Annuler",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index ba4dede6..7b8b718f 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Visualizza",
+ "add": "Aggiungi",
"save": "Salva",
"saving": "Salvataggio…",
"cancel": "Annulla",
diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.json
index 3abdc058..82a7cae9 100644
--- a/frontend/src/locales/pl.json
+++ b/frontend/src/locales/pl.json
@@ -1279,6 +1279,7 @@
},
"common": {
"view": "Zobacz",
+ "add": "Dodaj",
"save": "Zapisz",
"saving": "Zapisywanie…",
"cancel": "Anuluj",
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index 050883c9..2cf7368a 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Ver",
+ "add": "Adicionar",
"save": "Salvar",
"saving": "Salvando…",
"cancel": "Cancelar",
diff --git a/frontend/src/locales/pt-PT.json b/frontend/src/locales/pt-PT.json
index 00579397..9254ca8f 100644
--- a/frontend/src/locales/pt-PT.json
+++ b/frontend/src/locales/pt-PT.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Ver",
+ "add": "Adicionar",
"save": "Guardar",
"saving": "A guardar…",
"cancel": "Cancelar",
diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json
index f1c73fb2..01d2ccc8 100644
--- a/frontend/src/locales/ru.json
+++ b/frontend/src/locales/ru.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Просмотр",
+ "add": "Добавить",
"save": "Сохранить",
"saving": "Сохранение…",
"cancel": "Отмена",
diff --git a/frontend/src/locales/uk.json b/frontend/src/locales/uk.json
index ef72b5a8..bbdbf6a7 100644
--- a/frontend/src/locales/uk.json
+++ b/frontend/src/locales/uk.json
@@ -1204,6 +1204,7 @@
},
"common": {
"view": "Переглянути",
+ "add": "Додати",
"save": "Зберегти",
"saving": "Збереження…",
"cancel": "Скасувати",
diff --git a/frontend/src/pages/accounts.tsx b/frontend/src/pages/accounts.tsx
index 4e6c4215..af1fb165 100644
--- a/frontend/src/pages/accounts.tsx
+++ b/frontend/src/pages/accounts.tsx
@@ -24,18 +24,10 @@ import { DatePickerInput } from '@/components/ui/date-picker-input'
import { Badge } from '@/components/ui/badge'
import { Skeleton } from '@/components/ui/skeleton'
import type { Account, BankConnection } from '@/types'
-import {
- Pencil,
- Trash2,
- RefreshCw,
- TriangleAlert,
- Unlink,
- Plus,
- Settings,
- Archive,
- Layers,
-} from 'lucide-react'
+import { RefreshCw, TriangleAlert, Unlink, Settings } from 'lucide-react'
import { AccountIcon, ConnectionLogo, getAccountTypeConfig } from '@/components/account-icon'
+import { AccountPageActions } from '@/components/account-page-actions'
+import { AccountRowActions } from '@/components/account-row-actions'
import { PageHeader } from '@/components/page-header'
import { BankConnectDialog } from '@/components/bank-connect-dialog'
import { ConnectorSelectDialog, type Provider } from '@/components/connector-select-dialog'
@@ -237,24 +229,12 @@ export default function AccountsPage() {
section={t('accounts.title')}
title={t('accounts.title')}
action={
- <div className="flex gap-2">
- <Button variant="outline" className="gap-1.5" onClick={() => navigate('/collections')}>
- <Layers size={16} />
- {t('collections.title')}
- </Button>
- {canWrite && (
- <>
- <Button variant="outline" className="gap-1.5" onClick={() => setConnectorSelectOpen(true)}>
- <Plus size={16} />
- {t('accounts.connectBank')}
- </Button>
- <Button onClick={() => { setEditingAccount(null); setDialogOpen(true) }} className="gap-1.5">
- <Plus size={16} />
- {t('accounts.addManual')}
- </Button>
- </>
- )}
- </div>
+ <AccountPageActions
+ canWrite={canWrite}
+ onAddAccount={() => { setEditingAccount(null); setDialogOpen(true) }}
+ onConnectBank={() => setConnectorSelectOpen(true)}
+ onOpenCollections={() => navigate('/collections')}
+ />
}
/>
@@ -296,33 +276,7 @@ export default function AccountsPage() {
</p>
</div>
</Link>
- {canWrite && (
- <div className="flex items-center gap-1 mr-3 opacity-0 group-hover:opacity-100 transition-opacity">
- <button
- className="p-1.5 rounded-md text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
- onClick={() => { setEditingAccount(acc); setDialogOpen(true) }}
- title={t('common.edit')}
- >
- <Pencil size={13} />
- </button>
- <button
- className="p-1.5 rounded-md text-muted-foreground hover:text-amber-600 hover:bg-amber-50 transition-colors"
- onClick={() => setClosingAccountId(acc.id)}
- title={t('accounts.close')}
- >
- <Archive size={13} />
- </button>
- <button
- className="p-1.5 rounded-md text-muted-foreground hover:text-rose-500 hover:bg-rose-50 transition-colors"
- onClick={() => setDeletingId(acc.id)}
- disabled={deleteMutation.isPending}
- title={t('common.delete')}
- >
- <Trash2 size={13} />
- </button>
- </div>
- )}
- <div className="text-right">
+ <div className="shrink-0 text-right">
<p className={`text-xs sm:text-sm font-semibold tabular-nums ${(acc.type === 'credit_card' ? bal > 0 : bal < 0) ? 'text-rose-500' : 'text-foreground'}`}>
{mask(formatCurrency(bal, acc.currency, locale))}
</p>
@@ -336,6 +290,15 @@ export default function AccountsPage() {
</p>
)}
</div>
+ {canWrite && (
+ <AccountRowActions
+ accountName={getAccountName(acc)}
+ onEdit={() => { setEditingAccount(acc); setDialogOpen(true) }}
+ onClose={() => setClosingAccountId(acc.id)}
+ onDelete={() => setDeletingId(acc.id)}
+ deletePending={deleteMutation.isPending}
+ />
+ )}
</div>
)
})}
@@ -456,25 +419,7 @@ export default function AccountsPage() {
</p>
</div>
</Link>
- {canWrite && (
- <div className="flex items-center gap-1 mr-3 opacity-0 group-hover:opacity-100 transition-opacity">
- <button
- className="p-1.5 rounded-md text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
- onClick={(e) => { e.preventDefault(); setEditingAccount(acc); setDialogOpen(true) }}
- title={t('common.edit')}
- >
- <Pencil size={13} />
- </button>
- <button
- className="p-1.5 rounded-md text-muted-foreground hover:text-amber-600 hover:bg-amber-50 transition-colors"
- onClick={(e) => { e.preventDefault(); setClosingAccountId(acc.id) }}
- title={t('accounts.close')}
- >
- <Archive size={13} />
- </button>
- </div>
- )}
- <div className="text-right">
+ <div className="shrink-0 text-right">
<p className={`text-xs sm:text-sm font-semibold tabular-nums ${(acc.type === 'credit_card' ? bal > 0 : bal < 0) ? 'text-rose-500' : 'text-foreground'}`}>
{mask(formatCurrency(bal, acc.currency, locale))}
</p>
@@ -488,6 +433,14 @@ export default function AccountsPage() {
</p>
)}
</div>
+ {canWrite && (
+ <AccountRowActions
+ accountName={getAccountName(acc)}
+ onEdit={() => { setEditingAccount(acc); setDialogOpen(true) }}
+ onClose={() => setClosingAccountId(acc.id)}
+ deletePending={deleteMutation.isPending}
+ />
+ )}
</div>
)
})}
diff --git a/frontend/src/pages/transactions.tsx b/frontend/src/pages/transactions.tsx
index 593bea46..adff571e 100644
--- a/frontend/src/pages/transactions.tsx
+++ b/frontend/src/pages/transactions.tsx
@@ -3,7 +3,6 @@ import { useRegisterPageChatContext } from '@/lib/page-chat-context'
import { getAccountName } from '@/lib/account-utils'
import { AccountIcon } from '@/components/account-icon'
import { currentMonth, monthRange, monthFromRange } from '@/lib/month-utils'
-import { MonthStepper } from '@/components/month-stepper'
import { useNavigate, useSearchParams } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
@@ -35,13 +34,7 @@ import {
TableRow,
} from '@/components/ui/table'
import { Skeleton } from '@/components/ui/skeleton'
-import { AlertTriangle, ArrowLeftRight, ArrowUp, ArrowDown, Check, Copy, Download, HelpCircle, Info, MoreHorizontal, Paperclip, Users, X, EyeClosed, SlidersHorizontal } from 'lucide-react'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
+import { AlertTriangle, ArrowLeftRight, ArrowUp, ArrowDown, Check, HelpCircle, Info, Paperclip, Users, X, EyeClosed, SlidersHorizontal } from 'lucide-react'
import type { Transaction, Rule } from '@/types'
import { RuleDialog, type RuleDialogInitialData } from '@/components/rule-dialog'
import { PageHeader } from '@/components/page-header'
@@ -50,6 +43,8 @@ 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 { TransactionsPageActions } from '@/components/transactions-page-actions'
+import { MobileBulkSelectionActions } from '@/components/mobile-bulk-selection-actions'
import { type ColumnDef, type ColumnId, useTransactionsGridState } from '@/components/transactions-grid-columns'
import { TransferDialog } from '@/components/transfer-dialog'
import { LinkTransferDialog } from '@/components/link-transfer-dialog'
@@ -1152,82 +1147,22 @@ export default function TransactionsPage() {
section={t('transactions.section')}
title={t('transactions.title')}
action={
- // Single row at every width: [month stepper] [+ Add Transaction] [⋯].
- // The stepper is compact and shrinks first so all three fit on a
- // phone (#257). On desktop the secondary actions (Columns, Export,
- // Duplicate, Transfer) are inline labelled buttons; on mobile they
- // collapse into the overflow menu so the row stays uncrowded.
- <div className="flex items-center gap-2 sm:flex-wrap sm:justify-end">
- <MonthStepper
- value={steppedMonth}
- onChange={handleMonthChange}
- locale={i18n.resolvedLanguage ?? i18n.language}
- prevLabel={t('transactions.monthPrevious')}
- nextLabel={t('transactions.monthNext')}
- />
-
- {/* Secondary actions: inline labelled buttons on desktop. */}
- <div className="hidden sm:contents">
- <TransactionsColumnPicker state={grid} />
- <Button variant="outline" disabled={exporting} onClick={handleExport}>
- <Download size={16} className="mr-1.5" />
- {exportLabel}
- </Button>
- {/* Duplicate (issue #158): single non-shared, non-transfer row
- selected. Pre-fills Add Transaction from its fields. */}
- {duplicableTx && (
- <Button variant="outline" onClick={() => handleDuplicateTransaction(duplicableTx)}>
- <Copy size={16} className="mr-1.5" />
- {t('transactions.duplicate')}
- </Button>
- )}
- {canWrite && (
- <Button variant="outline" onClick={() => setTransferDialogOpen(true)}>
- <ArrowLeftRight size={16} className="mr-1.5" />
- {t('transactions.transfer')}
- </Button>
- )}
- </div>
-
- {/* Primary action: present at every width. */}
- {canWrite && (
- <Button onClick={() => { setEditingTx(null); setDialogOpen(true) }}>
- + {t('transactions.addManual')}
- </Button>
- )}
-
- {/* Secondary actions: overflow menu on mobile only. */}
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="outline"
- size="icon"
- className="!size-9 sm:hidden"
- aria-label={t('common.more')}
- >
- <MoreHorizontal size={18} />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem disabled={exporting} onClick={handleExport}>
- <Download size={16} className="mr-2" />
- {exportLabel}
- </DropdownMenuItem>
- {duplicableTx && (
- <DropdownMenuItem onClick={() => handleDuplicateTransaction(duplicableTx)}>
- <Copy size={16} className="mr-2" />
- {t('transactions.duplicate')}
- </DropdownMenuItem>
- )}
- {canWrite && (
- <DropdownMenuItem onClick={() => setTransferDialogOpen(true)}>
- <ArrowLeftRight size={16} className="mr-2" />
- {t('transactions.transfer')}
- </DropdownMenuItem>
- )}
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
+ <TransactionsPageActions
+ month={{
+ value: steppedMonth,
+ onChange: handleMonthChange,
+ locale: i18n.resolvedLanguage ?? i18n.language,
+ prevLabel: t('transactions.monthPrevious'),
+ nextLabel: t('transactions.monthNext'),
+ }}
+ columnPicker={<TransactionsColumnPicker state={grid} />}
+ exportLabel={exportLabel}
+ exporting={exporting}
+ onExport={handleExport}
+ onAdd={canWrite ? () => { setEditingTx(null); setDialogOpen(true) } : undefined}
+ onDuplicate={duplicableTx ? () => handleDuplicateTransaction(duplicableTx) : undefined}
+ onTransfer={canWrite ? () => setTransferDialogOpen(true) : undefined}
+ />
}
/>
@@ -1516,6 +1451,34 @@ export default function TransactionsPage() {
>
<div className="mx-auto max-w-7xl px-3 md:px-6 pb-4 md:pb-6">
<div className="flex items-stretch gap-1.5 bg-card border border-border shadow-xl rounded-2xl p-2">
+ <MobileBulkSelectionActions
+ selectedCount={selectedIds.size}
+ categoryValue={bulkCategory}
+ categories={categoriesList ?? []}
+ categoryGroups={categoryGroupsList ?? []}
+ categoryPending={bulkCategorizeMutation.isPending}
+ groupPending={bulkAddToGroupMutation.isPending}
+ tagInput={bulkTagInput}
+ addTagsPending={bulkAddTagsMutation.isPending}
+ removeTagsPending={bulkRemoveTagsMutation.isPending}
+ transferDisabled={!canOpenLinkDialog}
+ transferTitle={linkDisabledTooltip ?? t('transactions.linkAsTransfer')}
+ onCategoryChange={(next) => {
+ setBulkCategory(next)
+ if (next) bulkCategorizeMutation.mutate({ ids: Array.from(selectedIds), categoryId: next })
+ }}
+ onOpenGroup={() => setBulkAddToGroupOpen(true)}
+ onOpenTransfer={() => setLinkTransferDialogOpen(true)}
+ onCreateRule={selectedSingleTx && !selectedSingleTx.is_shared
+ ? () => handleCreateRuleFromTransaction(selectedSingleTx)
+ : undefined}
+ onTagInputChange={setBulkTagInput}
+ onAddTags={(tags) => bulkAddTagsMutation.mutate({ ids: Array.from(selectedIds), tags })}
+ onRemoveTags={(tags) => bulkRemoveTagsMutation.mutate({ ids: Array.from(selectedIds), tags })}
+ onClear={() => { setSelectedIds(new Set()); setBulkCategory(''); setBulkTagInput('') }}
+ />
+
+ <div className="hidden w-full items-stretch gap-1.5 sm:flex">
{/* Selection count + net total — stacked vertically so the
sum (issue #185) adds no horizontal width to an already
crowded bar. The sum is hidden below sm where only the
@@ -1673,6 +1636,7 @@ export default function TransactionsPage() {
>
<X size={16} />
</button>
+ </div>
</div>
</div>
</div>