Open-source personal finance manager. Self-hosted, privacy-first.
feat: link existing transaction as group settlement (#184) (#211)
Tássio Noronhaa54d7dd38af5
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.jsonindex 0270a29b..68d5cce2 100644--- a/frontend/src/locales/en.json+++ b/frontend/src/locales/en.json@@ -974,6 +974,13 @@"affectAccount": "Also record as a transaction in my account","selectAccount": "Select an account...","affectAccountHint": "A debit will be created on your account for this amount and linked to the settlement.",+ "txAction": "Transaction",+ "txActionNone": "Don't record a transaction",+ "txActionCreate": "Create a new transaction",+ "txActionExisting": "Link an existing transaction",+ "searchTransaction": "Search transactions by description...",+ "noTransactions": "No transactions found.",+ "selectedTransaction": "Selected","settled": "Settlement recorded","settlements": "Settlements","recordSettlement": "Record settlement",diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.jsonindex ccc1615b..699d87be 100644--- a/frontend/src/locales/pt-BR.json+++ b/frontend/src/locales/pt-BR.json@@ -974,6 +974,13 @@"affectAccount": "Registrar também como transação na minha conta","selectAccount": "Selecione uma conta...","affectAccountHint": "Será criada uma saída na sua conta com esse valor, vinculada ao acerto.",+ "txAction": "Transação",+ "txActionNone": "Não registrar uma transação",+ "txActionCreate": "Criar uma nova transação",+ "txActionExisting": "Vincular uma transação existente",+ "searchTransaction": "Buscar transações pela descrição...",+ "noTransactions": "Nenhuma transação encontrada.",+ "selectedTransaction": "Selecionada","settled": "Acerto registrado","settlements": "Acertos","recordSettlement": "Registrar acerto",diff --git a/frontend/src/pages/group-detail.tsx b/frontend/src/pages/group-detail.tsxindex dcd07e2d..089ac968 100644--- a/frontend/src/pages/group-detail.tsx+++ b/frontend/src/pages/group-detail.tsx@@ -1,4 +1,4 @@-import { useMemo, useState } from 'react'+import { useEffect, useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'import { useNavigate, useParams } from 'react-router-dom'import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'@@ -27,6 +27,7 @@ import {groups as groupsApi,users as usersApi,accounts as accountsApi,+ transactions as transactionsApi,type GroupMemberPayload,type GroupSettlementPayload,} from '@/lib/api'@@ -45,7 +46,7 @@ import {import { CategoryIcon } from '@/components/category-icon'import { DatePickerInput } from '@/components/ui/date-picker-input'import { PageHeader } from '@/components/page-header'-import type { GroupMember, GroupSettlement } from '@/types'+import type { GroupMember, GroupSettlement, Transaction } from '@/types'function formatCurrency(value: number, currency = 'USD', locale = 'en-US') {return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)@@ -306,8 +307,17 @@ export default function GroupDetailPage() {const [settleDate, setSettleDate] = useState(new Date().toISOString().split('T')[0])const [settleNotes, setSettleNotes] = useState('')const [settleCurrency, setSettleCurrency] = useState('USD')- const [settleAffectAccount, setSettleAffectAccount] = useState(false)+ // Optional ledger integration for the payer: 'none' records the+ // settlement only, 'create' makes a fresh debit, 'existing' links a+ // transaction the payer already has.+ const [settleTxMode, setSettleTxMode] = useState<'none' | 'create' | 'existing'>('none')const [settleAccountId, setSettleAccountId] = useState('')+ // The transaction picked to link, plus the search box state. We keep+ // the whole object so the selection stays visible even after the+ // search term changes and it drops out of the result list.+ const [settlePickedTx, setSettlePickedTx] = useState<Transaction | null>(null)+ const [settleTxSearch, setSettleTxSearch] = useState('')+ const [settleTxQuery, setSettleTxQuery] = useState('')// Accounts of the requesting user — needed only when the optional// "create transaction" toggle is enabled.@@ -317,6 +327,28 @@ export default function GroupDetailPage() {enabled: settleOpen,})+ // Debounce the transaction search so we don't hit the API on every+ // keystroke (mirrors the transactions page pattern).+ useEffect(() => {+ const id = setTimeout(() => setSettleTxQuery(settleTxSearch), 300)+ return () => clearTimeout(id)+ }, [settleTxSearch])++ // The payer's debit transactions, searched server-side and capped —+ // offered when linking an existing transaction instead of creating one.+ const { data: settleTxOptions } = useQuery({+ queryKey: ['settle-tx-options', settleTxQuery],+ queryFn: () =>+ transactionsApi.list({+ type: 'debit',+ q: settleTxQuery || undefined,+ limit: 20,+ sort_by: 'date',+ sort_dir: 'desc',+ }),+ enabled: settleOpen && settleTxMode === 'existing',+ })+const settlementMutation = useMutation({mutationFn: (payload: GroupSettlementPayload) =>groupsApi.settlements.create(groupId, payload),@@ -359,8 +391,11 @@ export default function GroupDetailPage() {// back to the group's default for free-form settlements. This// matters when the same group has cross-currency debts.setSettleCurrency(currency ?? group?.default_currency ?? 'USD')- setSettleAffectAccount(false)+ setSettleTxMode('none')setSettleAccountId('')+ setSettlePickedTx(null)+ setSettleTxSearch('')+ setSettleTxQuery('')setSettleOpen(true)}@@ -374,8 +409,10 @@ export default function GroupDetailPage() {date: settleDate,notes: settleNotes.trim() || null,}- if (settleAffectAccount && settleAccountId) {+ if (settleTxMode === 'create' && settleAccountId) {payload.account_id = settleAccountId+ } else if (settleTxMode === 'existing' && settlePickedTx) {+ payload.transaction_id = settlePickedTx.id}settlementMutation.mutate(payload)}@@ -1034,7 +1071,7 @@ export default function GroupDetailPage() {{/* Settle dialog */}<Dialog open={settleOpen} onOpenChange={setSettleOpen}>- <DialogContent className="sm:max-w-md">+ <DialogContent className="sm:max-w-md max-h-[85vh] overflow-y-auto"><DialogHeader><DialogTitle>{t('splitGroups.recordSettlement')}</DialogTitle></DialogHeader>@@ -1042,7 +1079,7 @@ export default function GroupDetailPage() {const myMemberId = viewerMember?.id ?? (isOwner ? ownerMember?.id : null)const viewerIsPayer = !!myMemberId && settleFrom === myMemberIdreturn (- <div className="space-y-4">+ <div className="space-y-4 min-w-0"><div className="space-y-2"><Label>{t('splitGroups.from')}</Label><select@@ -1050,10 +1087,12 @@ export default function GroupDetailPage() {value={settleFrom}onChange={(e) => {setSettleFrom(e.target.value)- // Reset the account-side toggle: it's only meaningful+ // Reset the ledger-side options: only meaningful// when the viewer is the payer.- setSettleAffectAccount(false)+ setSettleTxMode('none')setSettleAccountId('')+ setSettlePickedTx(null)+ setSettleTxSearch('')}}><option value="">{t('splitGroups.selectMember')}</option>@@ -1079,6 +1118,102 @@ export default function GroupDetailPage() {))}</select></div>+ {/* Transaction action — placed right after the members so+ the payer can decide upfront whether a real transaction+ will back this settlement. When linking an existing+ transaction, the amount/currency/date below mirror that+ transaction and lock so the two records can't disagree. */}+ {viewerIsPayer && (+ <div className="space-y-2">+ <Label>{t('splitGroups.txAction')}</Label>+ <select+ className="w-full border border-border rounded-md px-3 py-2 text-sm bg-background"+ value={settleTxMode}+ onChange={(e) => {+ setSettleTxMode(e.target.value as 'none' | 'create' | 'existing')+ setSettleAccountId('')+ setSettlePickedTx(null)+ setSettleTxSearch('')+ }}+ >+ <option value="none">{t('splitGroups.txActionNone')}</option>+ <option value="create">{t('splitGroups.txActionCreate')}</option>+ <option value="existing">{t('splitGroups.txActionExisting')}</option>+ </select>+ {settleTxMode === 'create' && (+ <div className="space-y-1">+ <select+ className="w-full border border-border rounded-md px-3 py-2 text-sm bg-background"+ value={settleAccountId}+ onChange={(e) => setSettleAccountId(e.target.value)}+ >+ <option value="">{t('splitGroups.selectAccount')}</option>+ {(accountsList ?? []).map((a) => (+ <option key={a.id} value={a.id}>+ {a.display_name || a.name}+ </option>+ ))}+ </select>+ <p className="text-xs text-muted-foreground">+ {t('splitGroups.affectAccountHint')}+ </p>+ </div>+ )}+ {settleTxMode === 'existing' && (+ <div className="space-y-1.5">+ <Input+ type="text"+ value={settleTxSearch}+ onChange={(e) => setSettleTxSearch(e.target.value)}+ placeholder={t('splitGroups.searchTransaction')}+ />+ <div className="max-h-44 overflow-y-auto rounded-md border border-border divide-y divide-border">+ {(settleTxOptions?.items ?? []).length === 0 ? (+ <p className="text-xs text-muted-foreground px-3 py-4 text-center">+ {t('splitGroups.noTransactions')}+ </p>+ ) : (+ (settleTxOptions?.items ?? []).map((tx) => {+ const picked = settlePickedTx?.id === tx.id+ return (+ <button+ key={tx.id}+ type="button"+ onClick={() => {+ // Picking an existing transaction *as* the+ // settlement: align amount, currency and+ // date so the two records can't disagree.+ setSettlePickedTx(tx)+ setSettleAmount(Number(tx.amount).toFixed(2))+ setSettleCurrency(tx.currency)+ setSettleDate(tx.date)+ }}+ className={`w-full text-left px-3 py-2 text-sm flex items-center justify-between gap-3 ${+ picked ? 'bg-primary/10' : 'hover:bg-muted/50'+ }`}+ >+ <span className="min-w-0 truncate">+ <span className="text-muted-foreground">{tx.date}</span> ·{' '}+ {tx.description}+ </span>+ <span className="shrink-0 tabular-nums text-muted-foreground">+ {tx.amount} {tx.currency}+ </span>+ </button>+ )+ })+ )}+ </div>+ {settlePickedTx && (+ <p className="text-xs text-muted-foreground truncate">+ {t('splitGroups.selectedTransaction')}: {settlePickedTx.date} ·{' '}+ {settlePickedTx.description}+ </p>+ )}+ </div>+ )}+ </div>+ )}<div className="grid grid-cols-3 gap-3"><div className="space-y-2 col-span-2"><Label>{t('splitGroups.amount')}</Label>@@ -1087,6 +1222,7 @@ export default function GroupDetailPage() {step="0.01"value={settleAmount}onChange={(e) => setSettleAmount(e.target.value)}+ disabled={settleTxMode === 'existing'}/></div><div className="space-y-2">@@ -1095,6 +1231,7 @@ export default function GroupDetailPage() {value={settleCurrency}maxLength={3}onChange={(e) => setSettleCurrency(e.target.value.toUpperCase())}+ disabled={settleTxMode === 'existing'}/></div></div>@@ -1104,6 +1241,7 @@ export default function GroupDetailPage() {value={settleDate}onChange={setSettleDate}className="w-full justify-start"+ disabled={settleTxMode === 'existing'}/></div><div className="space-y-2">@@ -1115,45 +1253,6 @@ export default function GroupDetailPage() {onChange={(e) => setSettleNotes(e.target.value)}/></div>-- {/* Optional account integration — only relevant when the- viewer is the *payer* of this settlement. In that case- we can write a real debit to one of their accounts. The- receiver's mirror credit is created automatically by the- backend when the receiver is a Securo user, so we don't- expose that path in the UI here. */}- {viewerIsPayer && (- <div className="space-y-2 pt-2 border-t border-border">- <label className="text-sm font-medium inline-flex items-center gap-2 cursor-pointer">- <input- type="checkbox"- checked={settleAffectAccount}- onChange={(e) => setSettleAffectAccount(e.target.checked)}- className="h-4 w-4 rounded border-border accent-primary"- />- {t('splitGroups.affectAccount')}- </label>- {settleAffectAccount && (- <div className="space-y-1">- <select- className="w-full border border-border rounded-md px-3 py-2 text-sm bg-background"- value={settleAccountId}- onChange={(e) => setSettleAccountId(e.target.value)}- >- <option value="">{t('splitGroups.selectAccount')}</option>- {(accountsList ?? []).map((a) => (- <option key={a.id} value={a.id}>- {a.display_name || a.name}- </option>- ))}- </select>- <p className="text-xs text-muted-foreground">- {t('splitGroups.affectAccountHint')}- </p>- </div>- )}- </div>- )}</div>)})()}@@ -1168,7 +1267,8 @@ export default function GroupDetailPage() {!settleTo ||settleFrom === settleTo ||!settleAmount ||- (settleAffectAccount && !settleAccountId) ||+ (settleTxMode === 'create' && !settleAccountId) ||+ (settleTxMode === 'existing' && !settlePickedTx) ||settlementMutation.isPending}>