Skip to content

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

feat(transactions): add transactions from the sidebar and the account page (#1006)

Tássio Noronha3928f9211ef5
diff --git a/frontend/src/components/app-layout.tsx b/frontend/src/components/app-layout.tsx
index c74a7866..8d023e11 100644
--- a/frontend/src/components/app-layout.tsx
+++ b/frontend/src/components/app-layout.tsx
@@ -1,4 +1,4 @@
-import { useState, useCallback, useEffect, useMemo } from 'react'
+import { useState, useCallback, useEffect, useMemo, lazy, Suspense } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { Link, Outlet, useLocation, useNavigate } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
@@ -59,11 +59,13 @@ import { CommandPalette } from '@/components/command-palette'
import { useCommandPaletteHotkey } from '@/hooks/use-command-palette-hotkey'
import { GlobalChatPanel } from '@/components/global-chat-panel'
import { useFeatureFlags } from '@/hooks/use-feature-flags'
-import { Bot, Search, Sparkles } from 'lucide-react'
+import { Bot, Plus, Search, Sparkles } from 'lucide-react'
import { setThemeBasedOnSystem } from '@/lib/theme-utils'
import { useLocalAuthEnabled } from '@/hooks/use-local-auth'
import { formatCurrency } from '@/lib/format'
+const QuickAddTransaction = lazy(() => import('@/components/quick-add-transaction'))
+
const SIDEBAR_COLLAPSED_STORAGE_KEY = 'securo.sidebar.collapsed'
/** Placeholder rows shown while the workspace's module list is in flight. */
@@ -96,6 +98,7 @@ export function AppLayout() {
const { theme, setTheme, resolvedTheme } = useTheme()
const location = useLocation()
const [sidebarOpen, setSidebarOpen] = useState(false)
+ const [quickAddOpen, setQuickAddOpen] = useState(false)
const [desktopSidebarCollapsed, setDesktopSidebarCollapsed] = useState(
() => localStorage.getItem(SIDEBAR_COLLAPSED_STORAGE_KEY) === 'true',
)
@@ -448,7 +451,8 @@ export function AppLayout() {
? location.pathname === '/'
: location.pathname.startsWith(item.path)
const Icon = item.icon
- return (
+ const showQuickAdd = item.key === 'transactions' && canWrite
+ const link = (
<Link
key={item.key}
to={item.path}
@@ -475,6 +479,27 @@ export function AppLayout() {
<span className={cn(desktopSidebarCollapsed && 'lg:hidden')}>{t(`nav.${item.key}`)}</span>
</Link>
)
+ if (!showQuickAdd) return link
+ return (
+ <div key={item.key} className="relative flex items-center">
+ <div className="min-w-0 flex-1">{link}</div>
+ <button
+ type="button"
+ onClick={() => {
+ setSidebarOpen(false)
+ setQuickAddOpen(true)
+ }}
+ title={t('transactions.addManual')}
+ aria-label={t('transactions.addManual')}
+ className={cn(
+ 'absolute right-2 flex h-6 w-6 items-center justify-center rounded-md border border-sidebar-border bg-sidebar text-sidebar-muted transition-colors hover:bg-sidebar-accent hover:text-sidebar-foreground',
+ desktopSidebarCollapsed && 'lg:hidden',
+ )}
+ >
+ <Plus size={14} />
+ </button>
+ </div>
+ )
})}
</nav>
@@ -617,6 +642,11 @@ export function AppLayout() {
localAuthEnabled={localAuthEnabled}
/>
<BackupDialog open={backupOpen} onClose={() => setBackupOpen(false)} />
+ {quickAddOpen && (
+ <Suspense fallback={null}>
+ <QuickAddTransaction open={quickAddOpen} onClose={() => setQuickAddOpen(false)} />
+ </Suspense>
+ )}
<CommandPalette open={paletteOpen} onOpenChange={setPaletteOpen} />
{/* Slide-over global chat — opened from the sidebar pill or via
⌘J. The previous floating bottom-right button was removed
diff --git a/frontend/src/components/quick-add-transaction.tsx b/frontend/src/components/quick-add-transaction.tsx
new file mode 100644
index 00000000..ffc38059
--- /dev/null
+++ b/frontend/src/components/quick-add-transaction.tsx
@@ -0,0 +1,58 @@
+import { useQuery } from '@tanstack/react-query'
+import { TransactionDialog } from '@/components/transaction-dialog'
+import { useCreateTransaction } from '@/hooks/use-create-transaction'
+import { accounts as accountsApi, categories as categoriesApi, categoryGroups as categoryGroupsApi } from '@/lib/api'
+import { extractApiError } from '@/lib/api-errors'
+
+/**
+ * Create-transaction dialog reachable from anywhere in the app (the "+" next
+ * to Transactions in the sidebar). Loaded lazily by the layout, and it only
+ * fetches its lists while open, so pages that never use it pay nothing.
+ */
+export default function QuickAddTransaction({ open, onClose }: { open: boolean; onClose: () => void }) {
+ const {
+ mutation: createMutation,
+ create: createTransaction,
+ duplicateDraft,
+ setDuplicateDraft,
+ formResetKey,
+ } = useCreateTransaction({ onDone: onClose })
+
+ const { data: accountsList } = useQuery({
+ queryKey: ['accounts'],
+ queryFn: () => accountsApi.list(),
+ enabled: open,
+ })
+ const { data: categoriesList } = useQuery({
+ queryKey: ['categories'],
+ queryFn: categoriesApi.list,
+ enabled: open,
+ })
+ const { data: categoryGroupsList } = useQuery({
+ queryKey: ['categoryGroups'],
+ queryFn: categoryGroupsApi.list,
+ enabled: open,
+ })
+
+ return (
+ <TransactionDialog
+ open={open}
+ onClose={() => {
+ onClose()
+ setDuplicateDraft(null)
+ createMutation.reset()
+ }}
+ transaction={null}
+ duplicateDraft={duplicateDraft}
+ formResetKey={formResetKey}
+ categories={categoriesList ?? []}
+ categoryGroups={categoryGroupsList ?? []}
+ accounts={(accountsList ?? []).filter(a => !a.is_closed)}
+ onSave={(data, recurringData, installmentData, pendingFiles, action) => {
+ createTransaction(data, recurringData, installmentData, pendingFiles, action)
+ }}
+ loading={createMutation.isPending}
+ error={createMutation.error ? extractApiError(createMutation.error) : null}
+ />
+ )
+}
diff --git a/frontend/src/components/transaction-dialog.tsx b/frontend/src/components/transaction-dialog.tsx
index 4eadd4cc..652e354a 100644
--- a/frontend/src/components/transaction-dialog.tsx
+++ b/frontend/src/components/transaction-dialog.tsx
@@ -109,13 +109,14 @@ export function TransactionDialog({
isSynced = false,
duplicateDraft = null,
formResetKey = 0,
+ defaultAccountId,
}: {
open: boolean
onClose: () => void
transaction: Transaction | null
categories: Category[]
categoryGroups: CategoryGroup[]
- accounts: { id: string; name: string; display_name?: string | null; type?: string }[]
+ accounts: { id: string; name: string; display_name?: string | null; type?: string; currency?: string }[]
recurringMatch?: RecurringTransaction
onSave: (data: TransactionSavePayload, recurringData?: { frequency: string; end_date?: string }, installmentData?: InstallmentSeriesInput, pendingFiles?: File[], action?: SaveAction) => void
onDelete?: () => void
@@ -127,6 +128,8 @@ export function TransactionDialog({
isSynced?: boolean
duplicateDraft?: TransactionEditPayload | null
formResetKey?: number
+ /** Account preselected when creating a new transaction. */
+ defaultAccountId?: string
}) {
const { t } = useTranslation()
const [preview, setPreview] = useState<AttachmentPreview | null>(null)
@@ -217,6 +220,7 @@ export function TransactionDialog({
key={transaction?.id ?? `new-${formResetKey}`}
transaction={transaction}
duplicateDraft={duplicateDraft}
+ defaultAccountId={defaultAccountId}
categories={categories}
categoryGroups={categoryGroups}
accounts={accounts}
@@ -378,6 +382,7 @@ export function TransactionDialog({
function TransactionForm({
transaction,
duplicateDraft,
+ defaultAccountId,
categories,
categoryGroups,
accounts,
@@ -397,9 +402,10 @@ function TransactionForm({
}: {
transaction: Transaction | null
duplicateDraft: TransactionEditPayload | null
+ defaultAccountId?: string
categories: Category[]
categoryGroups: CategoryGroup[]
- accounts: { id: string; name: string; display_name?: string | null; type?: string }[]
+ accounts: { id: string; name: string; display_name?: string | null; type?: string; currency?: string }[]
recurringMatch?: RecurringTransaction
onSave: (data: TransactionEditPayload, recurringData?: { frequency: string; end_date?: string }, installmentData?: InstallmentSeriesInput, pendingFiles?: File[], action?: SaveAction) => void
onDelete?: () => void
@@ -443,10 +449,15 @@ function TransactionForm({
const [date, setDate] = useState(seed?.date ?? localDateString())
const [type, setType] = useState<'debit' | 'credit'>(seed?.type ?? 'debit')
const [status, setStatus] = useState<'posted' | 'pending'>(seed?.status ?? 'posted')
- const [currency, setCurrency] = useState(seed?.currency ?? userCurrency)
+ // Opened from an account page, start in that account's currency.
+ const [currency, setCurrency] = useState(
+ seed?.currency
+ ?? (defaultAccountId ? accounts.find(a => a.id === defaultAccountId)?.currency : undefined)
+ ?? userCurrency
+ )
const [categoryId, setCategoryId] = useState(seed?.category_id ?? '')
const [payeeId, setPayeeId] = useState(seed?.payee_id ?? '')
- const [accountId, setAccountId] = useState(seed?.account_id ?? sortedAccounts[0]?.id ?? '')
+ const [accountId, setAccountId] = useState(seed?.account_id ?? defaultAccountId ?? sortedAccounts[0]?.id ?? '')
const [notes, setNotes] = useState(seed?.notes ?? '')
// Manual CC bucketing override (issue #92). Empty = auto. Visible only
// when the selected account is a credit card.
diff --git a/frontend/src/hooks/use-create-transaction.test.tsx b/frontend/src/hooks/use-create-transaction.test.tsx
new file mode 100644
index 00000000..ad23cf82
--- /dev/null
+++ b/frontend/src/hooks/use-create-transaction.test.tsx
@@ -0,0 +1,118 @@
+import type { ReactNode } from 'react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { QueryClientProvider, type QueryClient } from '@tanstack/react-query'
+
+import { useCreateTransaction } from '@/hooks/use-create-transaction'
+import { createTestQueryClient } from '@/test/utils'
+import type { TransactionEditPayload } from '@/types'
+
+const api = vi.hoisted(() => ({
+ transactions: {
+ create: vi.fn(),
+ createInstallments: vi.fn(),
+ attachments: { upload: vi.fn() },
+ },
+ recurring: { create: vi.fn() },
+}))
+vi.mock('@/lib/api', () => api)
+vi.mock('sonner', () => ({ toast: { success: vi.fn(), error: vi.fn() } }))
+vi.mock('@/contexts/auth-context', () => ({
+ useAuth: () => ({ user: { preferences: { currency_display: 'BRL' } } }),
+}))
+
+const tx: TransactionEditPayload = {
+ description: 'Coffee',
+ amount: 12.5,
+ type: 'debit',
+ date: '2026-09-23',
+ account_id: 'acc-1',
+ category_id: 'cat-1',
+}
+
+let queryClient: QueryClient
+
+function wrapper({ children }: { children: ReactNode }) {
+ return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+}
+
+beforeEach(() => {
+ vi.clearAllMocks()
+ queryClient = createTestQueryClient()
+ api.transactions.create.mockResolvedValue({ id: 'tx-1' })
+ api.transactions.createInstallments.mockResolvedValue([{ id: 'tx-a' }, { id: 'tx-b' }])
+ api.transactions.attachments.upload.mockResolvedValue({})
+ api.recurring.create.mockResolvedValue({})
+})
+
+describe('useCreateTransaction', () => {
+ it('creates the transaction, uploads pending files and closes on a plain save', async () => {
+ const onDone = vi.fn()
+ const invalidate = vi.spyOn(queryClient, 'invalidateQueries')
+ const file = new File(['x'], 'receipt.pdf')
+ const { result } = renderHook(() => useCreateTransaction({ onDone }), { wrapper })
+
+ act(() => result.current.create(tx, undefined, undefined, [file], 'save'))
+
+ await waitFor(() => expect(onDone).toHaveBeenCalledTimes(1))
+ expect(api.transactions.create).toHaveBeenCalledWith(tx)
+ expect(api.transactions.attachments.upload).toHaveBeenCalledWith('tx-1', file)
+ expect(api.recurring.create).not.toHaveBeenCalled()
+ const keys = invalidate.mock.calls.map(([filters]) => filters?.queryKey?.[0])
+ expect(keys).toEqual(expect.arrayContaining(['transactions', 'accounts', 'dashboard', 'recurring']))
+ })
+
+ it('creates a recurring entry that skips the first occurrence', async () => {
+ const onDone = vi.fn()
+ const { result } = renderHook(() => useCreateTransaction({ onDone }), { wrapper })
+
+ act(() => result.current.create(tx, { frequency: 'monthly' }))
+
+ await waitFor(() => expect(onDone).toHaveBeenCalled())
+ expect(api.recurring.create).toHaveBeenCalledWith(expect.objectContaining({
+ description: 'Coffee',
+ currency: 'BRL',
+ frequency: 'monthly',
+ start_date: '2026-09-23',
+ account_id: 'acc-1',
+ skip_first: true,
+ }))
+ })
+
+ it('creates an installment series and attaches files to its first row', async () => {
+ const file = new File(['x'], 'receipt.pdf')
+ const installments = { base: tx, total_installments: 3 } as never
+ const { result } = renderHook(() => useCreateTransaction({ onDone: vi.fn() }), { wrapper })
+
+ act(() => result.current.create(tx, undefined, installments, [file]))
+
+ await waitFor(() => expect(api.transactions.attachments.upload).toHaveBeenCalled())
+ expect(api.transactions.createInstallments).toHaveBeenCalledWith(installments)
+ expect(api.transactions.create).not.toHaveBeenCalled()
+ expect(api.transactions.attachments.upload).toHaveBeenCalledWith('tx-a', file)
+ })
+
+ it('keeps the dialog open and reseeds the form on save and duplicate', async () => {
+ const onDone = vi.fn()
+ const { result } = renderHook(() => useCreateTransaction({ onDone }), { wrapper })
+ const initialKey = result.current.formResetKey
+
+ act(() => result.current.create(tx, undefined, undefined, undefined, 'saveAndDuplicate'))
+
+ await waitFor(() => expect(result.current.duplicateDraft).toEqual(tx))
+ expect(result.current.formResetKey).toBe(initialKey + 1)
+ expect(onDone).not.toHaveBeenCalled()
+ })
+
+ it('keeps the dialog open with an empty form on save and new', async () => {
+ const onDone = vi.fn()
+ const { result } = renderHook(() => useCreateTransaction({ onDone }), { wrapper })
+ act(() => result.current.resetForm(tx))
+
+ act(() => result.current.create(tx, undefined, undefined, undefined, 'saveAndNew'))
+
+ await waitFor(() => expect(result.current.duplicateDraft).toBeNull())
+ expect(result.current.formResetKey).toBe(2)
+ expect(onDone).not.toHaveBeenCalled()
+ })
+})
diff --git a/frontend/src/hooks/use-create-transaction.ts b/frontend/src/hooks/use-create-transaction.ts
new file mode 100644
index 00000000..e0abcc26
--- /dev/null
+++ b/frontend/src/hooks/use-create-transaction.ts
@@ -0,0 +1,108 @@
+import { useState } from 'react'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
+import { recurring, transactions } from '@/lib/api'
+import { extractApiError } from '@/lib/api-errors'
+import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
+import { useAuth } from '@/contexts/auth-context'
+import type { SaveAction, TransactionSavePayload } from '@/components/transaction-dialog'
+import type { InstallmentSeriesInput, Transaction, TransactionEditPayload } from '@/types'
+
+export type RecurringInput = { frequency: string; end_date?: string }
+
+export type CreateTransactionInput = {
+ tx: TransactionEditPayload
+ recurringData?: RecurringInput
+ installmentData?: InstallmentSeriesInput
+ pendingFiles?: File[]
+ action?: SaveAction
+}
+
+/**
+ * The "add transaction" flow shared by every page that opens the
+ * TransactionDialog in create mode (transactions, account detail, dashboard),
+ * so recurring entries, installment series, pending attachments and the
+ * save / save and new / save and duplicate actions behave the same everywhere.
+ *
+ * Owns the dialog's create-mode draft state (`duplicateDraft`, `formResetKey`)
+ * and calls `onDone` when a plain save should close the dialog.
+ */
+export function useCreateTransaction({ onDone }: { onDone: () => void }) {
+ const { t } = useTranslation()
+ const queryClient = useQueryClient()
+ const { user } = useAuth()
+ const userCurrency = user?.preferences?.currency_display ?? 'USD'
+ const [duplicateDraft, setDuplicateDraft] = useState<TransactionEditPayload | null>(null)
+ const [formResetKey, setFormResetKey] = useState(0)
+
+ // Remount the create form, optionally seeded from a draft.
+ const resetForm = (draft: TransactionEditPayload | null = null) => {
+ setDuplicateDraft(draft)
+ setFormResetKey(k => k + 1)
+ }
+
+ const mutation = useMutation({
+ mutationFn: async (payload: CreateTransactionInput): Promise<Transaction> => {
+ let created: Transaction
+ if (payload.installmentData) {
+ // Manual installment series: the backend repeats the base row N
+ // times with the shared installment fingerprint.
+ const series = await transactions.createInstallments(payload.installmentData)
+ created = series[0]
+ } else {
+ created = await transactions.create(payload.tx)
+ }
+ if (payload.recurringData) {
+ await recurring.create({
+ description: payload.tx.description,
+ amount: payload.tx.amount,
+ currency: payload.tx.currency ?? userCurrency,
+ type: payload.tx.type,
+ frequency: payload.recurringData.frequency,
+ start_date: payload.tx.date,
+ end_date: payload.recurringData.end_date || undefined,
+ category_id: payload.tx.category_id || undefined,
+ account_id: payload.tx.account_id || undefined,
+ skip_first: true,
+ } as Record<string, unknown>)
+ }
+ if (payload.pendingFiles?.length) {
+ await Promise.all(
+ payload.pendingFiles.map(file => transactions.attachments.upload(created.id, file))
+ )
+ }
+ return created
+ },
+ onSuccess: (_created, variables) => {
+ invalidateFinancialQueries(queryClient)
+ queryClient.invalidateQueries({ queryKey: ['recurring'] })
+ // Goals tracking an account follow its balance.
+ queryClient.invalidateQueries({ queryKey: ['goals'] })
+ toast.success(t('transactions.created'))
+ if (variables.action === 'saveAndNew') {
+ resetForm(null)
+ } else if (variables.action === 'saveAndDuplicate') {
+ resetForm(variables.tx)
+ } else {
+ onDone()
+ }
+ },
+ onError: (error) => {
+ toast.error(extractApiError(error))
+ },
+ })
+
+ // Same signature as TransactionDialog's onSave, so it can be passed straight through.
+ const create = (
+ data: TransactionSavePayload,
+ recurringData?: RecurringInput,
+ installmentData?: InstallmentSeriesInput,
+ pendingFiles?: File[],
+ action?: SaveAction,
+ ) => {
+ mutation.mutate({ tx: data, recurringData, installmentData, pendingFiles, action })
+ }
+
+ return { mutation, create, duplicateDraft, setDuplicateDraft, formResetKey, resetForm }
+}
diff --git a/frontend/src/pages/account-detail.tsx b/frontend/src/pages/account-detail.tsx
index f06a9c26..019cf190 100644
--- a/frontend/src/pages/account-detail.tsx
+++ b/frontend/src/pages/account-detail.tsx
@@ -15,7 +15,7 @@ import { toast } from 'sonner'
import type { CreditCardBill, ProjectedTransaction, Transaction } from '@/types'
import { Skeleton } from '@/components/ui/skeleton'
import { Button } from '@/components/ui/button'
-import { ArrowLeft, ArrowLeftRight, CalendarClock, ChevronLeft, ChevronRight, Clock, EyeClosed, HelpCircle, Paperclip, Pencil, X } from 'lucide-react'
+import { ArrowLeft, ArrowLeftRight, CalendarClock, ChevronLeft, ChevronRight, Clock, EyeClosed, HelpCircle, Paperclip, Pencil, Plus, X } from 'lucide-react'
import { MobileTransactionRow } from '@/components/mobile-transaction-row'
import { CategoryIcon } from '@/components/category-icon'
import { ProjectedTransactionBadge } from '@/components/projected-transaction-badge'
@@ -31,6 +31,7 @@ import { usePrivacyMode } from '@/hooks/use-privacy-mode'
import { useIsMobile } from '@/hooks/use-mobile'
import { useAuth } from '@/contexts/auth-context'
import { useWorkspace } from '@/contexts/workspace-context'
+import { useCreateTransaction } from '@/hooks/use-create-transaction'
import { resolveDateFnsLocale } from '@/lib/date-fns-locale'
import { formatCurrency } from '@/lib/format'
import {
@@ -274,6 +275,19 @@ export default function AccountDetailPage() {
const [dialogOpen, setDialogOpen] = useState(false)
const [editingTx, setEditingTx] = useState<Transaction | null>(null)
const [transferDialogOpen, setTransferDialogOpen] = useState(false)
+ const {
+ mutation: createMutation,
+ create: createTransaction,
+ duplicateDraft,
+ setDuplicateDraft,
+ formResetKey,
+ resetForm,
+ } = useCreateTransaction({ onDone: () => setDialogOpen(false) })
+ const openCreateDialog = () => {
+ setEditingTx(null)
+ resetForm(null)
+ setDialogOpen(true)
+ }
const [filterFrom, setFilterFrom] = useState(defaultFrom)
const [filterTo, setFilterTo] = useState(defaultTo)
const [showPrimary, setShowPrimary] = useState(false)
@@ -914,15 +928,21 @@ export default function AccountDetailPage() {
</div>
</div>
{!account.is_closed && canWrite && (
- <Button
- variant="outline"
- size="sm"
- className="shrink-0"
- onClick={() => setTransferDialogOpen(true)}
- >
- <ArrowLeftRight className="h-4 w-4 mr-1" />
- {t('transactions.transfer')}
- </Button>
+ <div className="flex shrink-0 items-center gap-2">
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setTransferDialogOpen(true)}
+ >
+ <ArrowLeftRight className="h-4 w-4 mr-1" />
+ {t('transactions.transfer')}
+ </Button>
+ <Button size="sm" onClick={openCreateDialog}>
+ <Plus className="h-4 w-4 mr-1" />
+ <span className="sm:hidden">{t('common.add')}</span>
+ <span className="hidden sm:inline">{t('transactions.addManual')}</span>
+ </Button>
+ </div>
)}
</div>
<div className="flex items-center gap-2 sm:gap-3">
@@ -1704,20 +1724,30 @@ export default function AccountDetailPage() {
<TransactionDialog
open={dialogOpen}
- onClose={() => { setDialogOpen(false); setEditingTx(null) }}
+ onClose={() => {
+ setDialogOpen(false)
+ setEditingTx(null)
+ setDuplicateDraft(null)
+ createMutation.reset()
+ }}
transaction={editingTx}
+ duplicateDraft={duplicateDraft}
+ formResetKey={formResetKey}
+ defaultAccountId={id}
categories={categoriesList ?? []}
categoryGroups={categoryGroupsList ?? []}
accounts={accountsList ?? []}
- onSave={(data) => {
+ onSave={(data, recurringData, installmentData, pendingFiles, action) => {
if (editingTx) {
updateMutation.mutate({ id: editingTx.id, ...data })
+ } else {
+ createTransaction(data, recurringData, installmentData, pendingFiles, action)
}
}}
onDelete={editingTx ? () => deleteMutation.mutate(editingTx.id) : undefined}
onUnlinkTransfer={(pairId) => unlinkTransferMutation.mutate(pairId)}
- loading={updateMutation.isPending || deleteMutation.isPending || unlinkTransferMutation.isPending}
- error={updateMutation.error ? extractApiError(updateMutation.error) : null}
+ loading={createMutation.isPending || updateMutation.isPending || deleteMutation.isPending || unlinkTransferMutation.isPending}
+ error={createMutation.error ? extractApiError(createMutation.error) : updateMutation.error ? extractApiError(updateMutation.error) : null}
isSynced={editingTx?.source === 'sync'}
/>
diff --git a/frontend/src/pages/transactions.tsx b/frontend/src/pages/transactions.tsx
index 72bff6c0..8c75a071 100644
--- a/frontend/src/pages/transactions.tsx
+++ b/frontend/src/pages/transactions.tsx
@@ -56,6 +56,7 @@ import { TransactionsFilterBar } from '@/components/transactions-filter-bar'
import { TransactionCalendarView } from '@/components/transaction-calendar-view'
import { usePrivacyMode } from '@/hooks/use-privacy-mode'
import { useIsMobile } from '@/hooks/use-mobile'
+import { useCreateTransaction } from '@/hooks/use-create-transaction'
import { MobileTransactionRow } from '@/components/mobile-transaction-row'
import { useAuth } from '@/contexts/auth-context'
import { useWorkspace } from '@/contexts/workspace-context'
@@ -143,8 +144,6 @@ export default function TransactionsPage() {
// Manual installment-series scoped delete. Scoped edits are handled by the
// shared TransactionDialog so account detail and dashboard behave the same.
const [pendingSeriesDeleteId, setPendingSeriesDeleteId] = useState<string | null>(null)
- const [formResetKey, setFormResetKey] = useState(0)
- const [duplicateDraft, setDuplicateDraft] = useState<TransactionEditPayload | null>(null)
const [viewMode, setViewMode] = useState<'list' | 'calendar'>(() => (
searchParams.get('view') === 'calendar' ? 'calendar' : 'list'
))
@@ -522,56 +521,14 @@ export default function TransactionsPage() {
const invalidateAfterTxMutation = () => invalidateFinancialQueries(queryClient)
- const createMutation = useMutation({
- mutationFn: async (payload: { tx: TransactionEditPayload; recurringData?: { frequency: string; end_date?: string }; installmentData?: InstallmentSeriesInput; pendingFiles?: File[]; action?: SaveAction }) => {
- let created: Transaction
- if (payload.installmentData) {
- // Manual installment series: the backend repeats the base row N
- // times with the shared installment fingerprint.
- const series = await transactions.createInstallments(payload.installmentData)
- created = series[0]
- } else {
- created = await transactions.create(payload.tx)
- }
- if (payload.recurringData) {
- await recurring.create({
- description: payload.tx.description,
- amount: payload.tx.amount,
- currency: payload.tx.currency ?? userCurrency,
- type: payload.tx.type,
- frequency: payload.recurringData.frequency,
- start_date: payload.tx.date,
- end_date: payload.recurringData.end_date || undefined,
- category_id: payload.tx.category_id || undefined,
- account_id: payload.tx.account_id || undefined,
- skip_first: true,
- } as Record<string, unknown>)
- }
- if (payload.pendingFiles?.length) {
- await Promise.all(
- payload.pendingFiles.map(file => transactions.attachments.upload(created.id, file))
- )
- }
- return created
- },
- onSuccess: (_created, variables) => {
- invalidateAfterTxMutation()
- queryClient.invalidateQueries({ queryKey: ['recurring'] })
- toast.success(t('transactions.created'))
- if (variables.action === 'saveAndNew') {
- setDuplicateDraft(null)
- setFormResetKey(k => k + 1)
- } else if (variables.action === 'saveAndDuplicate') {
- setDuplicateDraft(variables.tx)
- setFormResetKey(k => k + 1)
- } else {
- setDialogOpen(false)
- }
- },
- onError: (error) => {
- toast.error(extractApiError(error))
- },
- })
+ const {
+ mutation: createMutation,
+ create: createTransaction,
+ duplicateDraft,
+ setDuplicateDraft,
+ formResetKey,
+ resetForm,
+ } = useCreateTransaction({ onDone: () => setDialogOpen(false) })
const updateMutation = useMutation({
mutationFn: ({ id, ...data }: TransactionUpdatePayload & { id: string }) =>
@@ -906,7 +863,7 @@ export default function TransactionsPage() {
action?: SaveAction,
) => {
if (!editingTx) {
- createMutation.mutate({ tx: data, recurringData, installmentData, pendingFiles, action })
+ createTransaction(data, recurringData, installmentData, pendingFiles, action)
return
}
@@ -949,8 +906,7 @@ export default function TransactionsPage() {
notes: tx.notes,
}
setEditingTx(null)
- setDuplicateDraft(draft)
- setFormResetKey(k => k + 1)
+ resetForm(draft)
setDialogOpen(true)
}