Open-source personal finance manager. Self-hosted, privacy-first.
fix(transaction-drill-down): clarify pending spending (#716)
Victor Hugo dos Santos5461df3380bc
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsxindex b73011c1..8efea0d9 100644--- a/frontend/src/App.tsx+++ b/frontend/src/App.tsx@@ -2,6 +2,7 @@ import { lazy, Suspense } from 'react'import { QueryClient, QueryClientProvider } from '@tanstack/react-query'import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'import { Toaster } from '@/components/ui/sonner'+import { TooltipProvider } from '@/components/ui/tooltip'import { ThemeProvider } from '@/components/theme-provider'import { AuthProvider } from '@/contexts/auth-context'import { WorkspaceProvider } from '@/contexts/workspace-context'@@ -63,6 +64,7 @@ function App() {return (<ThemeProvider><QueryClientProvider client={queryClient}>+ <TooltipProvider><BrowserRouter><AuthProvider><WorkspaceProvider>@@ -120,6 +122,7 @@ function App() {</WorkspaceProvider></AuthProvider></BrowserRouter>+ </TooltipProvider></QueryClientProvider></ThemeProvider>)diff --git a/frontend/src/components/transaction-drill-down.tsx b/frontend/src/components/transaction-drill-down.tsxindex 227934b9..ff31aa7b 100644--- a/frontend/src/components/transaction-drill-down.tsx+++ b/frontend/src/components/transaction-drill-down.tsx@@ -3,9 +3,10 @@ import { useTranslation } from 'react-i18next'import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'import { useQuery } from '@tanstack/react-query'import { transactions as transactionsApi, dashboard, admin } from '@/lib/api'-import { AlertTriangle, Info, Paperclip, X } from 'lucide-react'+import { AlertTriangle, Clock, Info, Paperclip, X } from 'lucide-react'import { CategoryIcon } from '@/components/category-icon'import { ProjectedTransactionBadge } from '@/components/projected-transaction-badge'+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'import { useAuth } from '@/contexts/auth-context'import { usePrivacyMode } from '@/hooks/use-privacy-mode'import type { Transaction } from '@/types'@@ -35,6 +36,7 @@ type DisplayItem = {categoryName: string | nullcategoryColor: string | nullisProjected: boolean+ isPending: booleanattachmentCount: numbertransaction: Transaction | null}@@ -106,6 +108,7 @@ export function TransactionDrillDown({categoryName: tx.category?.name ?? null,categoryColor: tx.category?.color ?? null,isProjected: false,+ isPending: tx.status === 'pending',attachmentCount: tx.attachment_count ?? 0,transaction: tx,})@@ -131,6 +134,7 @@ export function TransactionDrillDown({categoryName: pt.category_name,categoryColor: pt.category_color ?? null,isProjected: true,+ isPending: false,attachmentCount: 0,transaction: null,})@@ -172,15 +176,25 @@ export function TransactionDrillDown({// amount_primary; if it's missing we can't convert, so skip the row// instead of adding a raw foreign amount as if it were primary. This// matches how get_summary computes monthly_*_primary on the backend.- const absTotal = displayItems.reduce((sum, item) => {- if (item.currency === userCurrency) {- return sum + Math.abs(item.amount)- }- if (item.amountPrimary != null) {- return sum + Math.abs(item.amountPrimary)- }- return sum- }, 0)+ const { absTotal, postedTotal, pendingTotal } = displayItems.reduce(+ (totals, item) => {+ // For foreign-currency rows, skip missing conversions rather than+ // treating the raw amount as the user's primary currency.+ const amount = item.currency === userCurrency+ ? Math.abs(item.amount)+ : item.amountPrimary != null+ ? Math.abs(item.amountPrimary)+ : 0++ totals.absTotal += amount+ if (item.isPending) totals.pendingTotal += amount+ if (item.transaction?.status === 'posted') totals.postedTotal += amount+ return totals+ },+ { absTotal: 0, postedTotal: 0, pendingTotal: 0 },+ )++ const hasPendingTransactions = displayItems.some((item) => item.isPending)return (<>@@ -254,6 +268,16 @@ export function TransactionDrillDown({{item.isProjected && (<ProjectedTransactionBadge />)}+ {item.isPending && (+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="shrink-0 inline-flex items-center justify-center rounded-full border border-amber-200 bg-amber-50 p-0.5 dark:border-amber-500/30 dark:bg-amber-500/10">+ <Clock size={12} className="text-amber-500" role="img" aria-label={t('transactions.pending')} />+ </span>+ </TooltipTrigger>+ <TooltipContent>{t('transactions.pending')}</TooltipContent>+ </Tooltip>+ )}{item.attachmentCount > 0 && (<Paperclip size={12} className="text-muted-foreground shrink-0" />)}@@ -292,17 +316,34 @@ export function TransactionDrillDown({{/* Footer */}{displayItems.length > 0 && (<div className="px-5 py-3 border-t border-border bg-muted/50 shrink-0">- <div className="flex items-center justify-between">- <span className="text-xs text-muted-foreground">- {t('dashboard.drillDownTotal', {- count: displayItems.length,- total: mask(formatCurrency(absTotal, userCurrency, locale)),- })}- </span>- <span className="text-sm font-bold tabular-nums text-foreground">- {mask(formatCurrency(absTotal, userCurrency, locale))}- </span>- </div>+ {hasPendingTransactions ? (+ <div className="space-y-1">+ <div className="flex items-center justify-between gap-4 text-xs text-muted-foreground">+ <span>{t('dashboard.drillDownSettledTotal')}</span>+ <span className="tabular-nums text-foreground">{mask(formatCurrency(postedTotal, userCurrency, locale))}</span>+ </div>+ <div className="flex items-center justify-between gap-4 text-xs text-muted-foreground">+ <span>{t('dashboard.drillDownPendingTotal')}</span>+ <span className="tabular-nums text-foreground">{mask(formatCurrency(pendingTotal, userCurrency, locale))}</span>+ </div>+ <div className="flex items-center justify-between gap-4 border-t border-border pt-2 mt-2">+ <span className="text-xs font-medium text-muted-foreground">{t('dashboard.drillDownShownTotal')}</span>+ <span className="text-sm font-bold tabular-nums text-foreground">{mask(formatCurrency(postedTotal + pendingTotal, userCurrency, locale))}</span>+ </div>+ </div>+ ) : (+ <div className="flex items-center justify-between">+ <span className="text-xs text-muted-foreground">+ {t('dashboard.drillDownTotal', {+ count: displayItems.length,+ total: mask(formatCurrency(absTotal, userCurrency, locale)),+ })}+ </span>+ <span className="text-sm font-bold tabular-nums text-foreground">+ {mask(formatCurrency(absTotal, userCurrency, locale))}+ </span>+ </div>+ )}</div>)}</div>diff --git a/frontend/src/components/ui/tooltip.tsx b/frontend/src/components/ui/tooltip.tsxnew file mode 100644index 00000000..80e86e65--- /dev/null+++ b/frontend/src/components/ui/tooltip.tsx@@ -0,0 +1,62 @@+"use client"++import * as React from "react"+import { Tooltip as TooltipPrimitive } from "radix-ui"++import { cn } from "@/lib/utils"++function TooltipProvider({+ delayDuration = 200,+ ...props+}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {+ return (+ <TooltipPrimitive.Provider+ data-slot="tooltip-provider"+ delayDuration={delayDuration}+ {...props}+ />+ )+}++function Tooltip({+ ...props+}: React.ComponentProps<typeof TooltipPrimitive.Root>) {+ return <TooltipPrimitive.Root data-slot="tooltip" {...props} />+}++function TooltipTrigger({+ ...props+}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {+ return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />+}++function TooltipContent({+ className,+ sideOffset = 6,+ children,+ ...props+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {+ return (+ <TooltipPrimitive.Portal>+ <TooltipPrimitive.Content+ data-slot="tooltip-content"+ sideOffset={sideOffset}+ className={cn(+ "bg-foreground text-background z-50 max-w-xs rounded-lg px-3 py-2 text-xs leading-relaxed shadow-md outline-hidden",+ "data-[state=open]:animate-in data-[state=closed]:animate-out",+ "data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",+ "data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",+ "data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2",+ "data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ className,+ )}+ {...props}+ >+ {children}+ <TooltipPrimitive.Arrow className="fill-foreground" />+ </TooltipPrimitive.Content>+ </TooltipPrimitive.Portal>+ )+}++export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.jsonindex 14706ca9..500f78fc 100644--- a/frontend/src/locales/de.json+++ b/frontend/src/locales/de.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Nicht kategorisierte Transaktionen","drillDownDay": "Transaktionen — {{date}}","drillDownTotal": "{{count}} Transaktionen · {{total}}",+ "drillDownSettledTotal": "Gebucht · Zusammenfassungssumme",+ "drillDownPendingTotal": "Ausstehende Abrechnung",+ "drillDownShownTotal": "Angezeigte Summe","drillDownEmpty": "Keine Transaktionen gefunden","drillDownClose": "Schließen","accrualNote": "Kreditkartentransaktionen werden nach dem Fälligkeitsdatum der Abrechnung gruppiert (Soll-Modus).",diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.jsonindex 03f70a64..b6c338c2 100644--- a/frontend/src/locales/en.json+++ b/frontend/src/locales/en.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Uncategorized transactions","drillDownDay": "Transactions — {{date}}","drillDownTotal": "{{count}} transactions · {{total}}",+ "drillDownSettledTotal": "Settled · card total",+ "drillDownPendingTotal": "Pending settlement",+ "drillDownShownTotal": "Total shown","drillDownEmpty": "No transactions found","drillDownClose": "Close","accrualNote": "Credit-card transactions are grouped by bill due date (accrual mode).",diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.jsonindex 64734a6d..ebfeb42b 100644--- a/frontend/src/locales/es.json+++ b/frontend/src/locales/es.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Transacciones sin categorizar","drillDownDay": "Transacciones — {{date}}","drillDownTotal": "{{count}} transacciones · {{total}}",+ "drillDownSettledTotal": "Liquidado · total resumido",+ "drillDownPendingTotal": "Pendiente de liquidación",+ "drillDownShownTotal": "Total mostrado","drillDownEmpty": "No se encontraron transacciones","drillDownClose": "Cerrar","accrualNote": "Las transacciones con tarjeta de crédito se agrupan por la fecha de vencimiento de la factura (modo acumulado).",diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.jsonindex 410632fe..dcb161d8 100644--- a/frontend/src/locales/fr.json+++ b/frontend/src/locales/fr.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Transactions non catégorisées","drillDownDay": "Transactions — {{date}}","drillDownTotal": "{{count}} transactions · {{total}}",+ "drillDownSettledTotal": "Réglé · total récapitulatif",+ "drillDownPendingTotal": "En attente de règlement",+ "drillDownShownTotal": "Total affiché","drillDownEmpty": "Aucune transaction trouvée","drillDownClose": "Fermer","accrualNote": "Les transactions par carte de crédit sont regroupées par date d'échéance de la facture (mode comptabilité d'engagement).",diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.jsonindex 71602a13..bd329249 100644--- a/frontend/src/locales/it.json+++ b/frontend/src/locales/it.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Transazioni senza categoria","drillDownDay": "Transazioni — {{date}}","drillDownTotal": "{{count}} transazioni · {{total}}",+ "drillDownSettledTotal": "Regolato · totale riepilogativo",+ "drillDownPendingTotal": "In attesa di regolamento",+ "drillDownShownTotal": "Totale mostrato","drillDownEmpty": "Nessuna transazione trovata","drillDownClose": "Chiudi","accrualNote": "Le transazioni con carta di credito sono raggruppate per scadenza dell'estratto conto (modalità per competenza).",diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.jsonindex d0126231..12d2c81b 100644--- a/frontend/src/locales/nl.json+++ b/frontend/src/locales/nl.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Niet-gecategoriseerde transacties","drillDownDay": "Transacties — {{date}}","drillDownTotal": "{{count}} transacties · {{total}}",+ "drillDownSettledTotal": "Geboekt · samenvattingstotaal",+ "drillDownPendingTotal": "In afwachting van afrekening",+ "drillDownShownTotal": "Weergegeven totaal","drillDownEmpty": "Geen transacties gevonden","drillDownClose": "Sluiten","accrualNote": "Creditcardtransacties worden gegroepeerd op vervaldatum van de factuur (toerekeningsmodus).",diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.jsonindex b268637d..ba8bc806 100644--- a/frontend/src/locales/pl.json+++ b/frontend/src/locales/pl.json@@ -524,6 +524,9 @@"drillDownTotal_few": "{{count}} transakcje · {{total}}","drillDownTotal_many": "{{count}} transakcji · {{total}}","drillDownTotal_other": "{{count}} transakcji · {{total}}",+ "drillDownSettledTotal": "Zaksięgowane · suma podsumowania",+ "drillDownPendingTotal": "Oczekujące rozliczenie",+ "drillDownShownTotal": "Wyświetlana suma","drillDownEmpty": "Nie znaleziono transakcji","drillDownClose": "Zamknij","accrualNote": "Transakcje kartą kredytową są grupowane wg terminu płatności rachunku (tryb memoriałowy).",diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.jsonindex b7f99987..2ea87e46 100644--- a/frontend/src/locales/pt-BR.json+++ b/frontend/src/locales/pt-BR.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Transações sem categoria","drillDownDay": "Transações — {{date}}","drillDownTotal": "{{count}} transações · {{total}}",+ "drillDownSettledTotal": "Liquidado · valor da categoria",+ "drillDownPendingTotal": "Pendente de liquidação",+ "drillDownShownTotal": "Total exibido","drillDownEmpty": "Nenhuma transação encontrada","drillDownClose": "Fechar","accrualNote": "Transações de cartão de crédito são agrupadas pela data de vencimento da fatura (modo competência).",diff --git a/frontend/src/locales/pt-PT.json b/frontend/src/locales/pt-PT.jsonindex c82672cf..685f1292 100644--- a/frontend/src/locales/pt-PT.json+++ b/frontend/src/locales/pt-PT.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Transações sem categoria","drillDownDay": "Transações — {{date}}","drillDownTotal": "{{count}} transações · {{total}}",+ "drillDownSettledTotal": "Liquidado · valor resumido",+ "drillDownPendingTotal": "Pendente de liquidação",+ "drillDownShownTotal": "Total apresentado","drillDownEmpty": "Nenhuma transação encontrada","drillDownClose": "Fechar","accrualNote": "Transações de cartão de crédito são agrupadas pela data de vencimento da fatura (modo competência).",diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.jsonindex ed79db3d..2ce1674b 100644--- a/frontend/src/locales/ru.json+++ b/frontend/src/locales/ru.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Транзакции без категории","drillDownDay": "Транзакции — {{date}}","drillDownTotal": "{{count}} транзакций · {{total}}",+ "drillDownSettledTotal": "Проведено · сумма в сводке",+ "drillDownPendingTotal": "Ожидает расчёта",+ "drillDownShownTotal": "Показанная сумма","drillDownEmpty": "Транзакции не найдены","drillDownClose": "Закрыть","accrualNote": "Кредитные карты: транзакции группируются по дате платежа (метод начисления).",diff --git a/frontend/src/locales/sk.json b/frontend/src/locales/sk.jsonindex 1c185943..f5f21a28 100644--- a/frontend/src/locales/sk.json+++ b/frontend/src/locales/sk.json@@ -525,6 +525,9 @@"drillDownTotal_few": "{{count}} transakcie · {{total}}","drillDownTotal_many": "{{count}} transakcie · {{total}}","drillDownTotal_other": "{{count}} transakcií · {{total}}",+ "drillDownSettledTotal": "Zúčtované · súhrnná suma",+ "drillDownPendingTotal": "Čaká na zúčtovanie",+ "drillDownShownTotal": "Zobrazená suma","drillDownEmpty": "Nenašli sa žiadne transakcie","drillDownClose": "Zavrieť","accrualNote": "Transakcie kreditnou kartou sú zoskupené podľa dátumu splatnosti výpisu (akruálny režim).",diff --git a/frontend/src/locales/uk.json b/frontend/src/locales/uk.jsonindex 187c1cdc..4201bb7f 100644--- a/frontend/src/locales/uk.json+++ b/frontend/src/locales/uk.json@@ -521,6 +521,9 @@"drillDownUncategorized": "Транзакції без категорії","drillDownDay": "Транзакції — {{date}}","drillDownTotal": "{{count}} транзакцій · {{total}}",+ "drillDownSettledTotal": "Проведено · сума у зведенні",+ "drillDownPendingTotal": "Очікує розрахунку",+ "drillDownShownTotal": "Показана сума","drillDownEmpty": "Транзакції не знайдено","drillDownClose": "Закрити","accrualNote": "Кредитні картки: транзакції групуються за датою платежу (метод нарахування).",