Skip to content

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

fix(collections): prevent scroll lock, localize counts, and filter accounts (#585)

Danny Feliz220765f7062d
diff --git a/frontend/src/components/account-row-actions.tsx b/frontend/src/components/account-row-actions.tsx
index 302e06ab..04f62449 100644
--- a/frontend/src/components/account-row-actions.tsx
+++ b/frontend/src/components/account-row-actions.tsx
@@ -76,7 +76,10 @@ function DesktopAccountActions({ actions, deletePending }: {
deletePending: boolean
}) {
return (
- <div className="ml-2 hidden items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100 sm:flex">
+ // Always visible, like the row actions on payees, categories and rules.
+ // Hiding them until hover made them undiscoverable and unreachable by
+ // keyboard-only navigation.
+ <div className="ml-2 hidden items-center gap-1 sm:flex">
{actions.map((action) => (
<DesktopActionButton key={action.label} action={action} deletePending={deletePending} />
))}
diff --git a/frontend/src/components/collection-selector.tsx b/frontend/src/components/collection-selector.tsx
index 988029ee..aae82f9c 100644
--- a/frontend/src/components/collection-selector.tsx
+++ b/frontend/src/components/collection-selector.tsx
@@ -31,7 +31,7 @@ export function CollectionSelector({ variant = 'sidebar' }: { variant?: 'sidebar
if (collections.length === 0) return null
const menu = (
- <DropdownMenuContent align={variant === 'header' ? 'start' : 'start'} className="w-60">
+ <DropdownMenuContent align={variant === 'header' ? 'start' : 'start'} className="w-72">
<DropdownMenuItem onClick={() => setActiveCollectionId(null)} className="flex items-center gap-2">
<Layers size={14} className="text-muted-foreground" />
<span className="flex-1">{t('collections.allAccounts')}</span>
@@ -41,13 +41,16 @@ export function CollectionSelector({ variant = 'sidebar' }: { variant?: 'sidebar
{collections.map((c) => (
<DropdownMenuItem key={c.id} onClick={() => setActiveCollectionId(c.id)} className="flex items-center gap-2">
<span className="h-2.5 w-2.5 shrink-0 rounded-full" style={{ backgroundColor: c.color }} />
- <span className="flex-1 truncate">{c.name}</span>
- <span className="text-[10.5px] tabular-nums text-muted-foreground/70">
- {c.account_count > 0 && `${c.account_count}a`}
- {c.account_count > 0 && c.wallet_count > 0 && ' · '}
- {c.wallet_count > 0 && `${c.wallet_count}w`}
+ <span className="min-w-0 flex-1 truncate">{c.name}</span>
+ {/* Spelled out and translated: "8a · 3w" read as cropped text, and the
+ a/w abbreviations were English-only in a ten-locale UI. */}
+ <span className="shrink-0 whitespace-nowrap text-[11px] tabular-nums text-muted-foreground/70">
+ {[
+ c.account_count > 0 && t('collections.accountCount', { count: c.account_count }),
+ c.wallet_count > 0 && t('collections.walletCount', { count: c.wallet_count }),
+ ].filter(Boolean).join(' · ')}
</span>
- {activeCollection?.id === c.id && <Check size={14} className="text-primary" />}
+ {activeCollection?.id === c.id && <Check size={14} className="shrink-0 text-primary" />}
</DropdownMenuItem>
))}
<DropdownMenuSeparator />
@@ -62,7 +65,9 @@ export function CollectionSelector({ variant = 'sidebar' }: { variant?: 'sidebar
if (variant === 'sidebar') {
return (
<div className="px-3 pt-2">
- <DropdownMenu>
+ {/* Non-modal: the default locks body scroll while open, which hides the
+ page scrollbar and shifts the layout under the sticky bar. */}
+ <DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<button className="flex items-center gap-2 w-full rounded-lg border border-sidebar-border/60 bg-sidebar-accent/30 px-2.5 py-1.5 text-left hover:bg-sidebar-accent/50 transition-colors">
{activeCollection ? (
@@ -92,7 +97,9 @@ export function CollectionSelector({ variant = 'sidebar' }: { variant?: 'sidebar
<span className="text-[11px] font-medium uppercase tracking-[0.1em] text-muted-foreground/70">
{t('collections.viewing')}
</span>
- <DropdownMenu>
+ {/* Non-modal: the default locks body scroll while open, which hides the
+ page scrollbar and shifts the layout under the sticky bar. */}
+ <DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<button
className="group inline-flex items-center gap-2 rounded-full border border-border/60 px-3 py-1.5 text-[13px] transition-colors hover:bg-muted/50"
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d9fbb036..204e4378 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -717,7 +717,8 @@
"add": "Neue Sammlung",
"edit": "Sammlung bearbeiten",
"empty": "Noch keine Sammlungen. Erstelle eine, um deine Konten zu gruppieren.",
- "accountCount": "{{count}} Konten",
+ "accountCount_one": "{{count}} Konto",
+ "accountCount_other": "{{count}} Konten",
"name": "Name",
"namePlaceholder": "z.B. Geschäftlich, Langfristig, Notgroschen",
"color": "Farbe",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}} ausgewählt",
"wallets": "Portfolios",
"walletsHint": "{{count}} ausgewählt",
- "walletCount": "{{count}} Portfolios",
+ "walletCount_one": "{{count}} Portfolio",
+ "walletCount_other": "{{count}} Portfolios",
"noAccounts": "Noch keine Konten.",
"created": "Sammlung erstellt",
"updated": "Sammlung aktualisiert",
@@ -1170,6 +1172,7 @@
"noManualAccounts": "Noch keine manuellen Konten",
"noBankConnections": "Keine Bankverbindungen",
"noAccountsFound": "Keine Konten gefunden",
+ "emptyFiltered": "Zu diesem Filter passt nichts.",
"accountName": "Kontoname",
"displayName": "Anzeigename",
"displayNameHint": "Überschreibt den Standardnamen des Anbieters überall in der App.",
diff --git a/frontend/src/locales/el.json b/frontend/src/locales/el.json
index e6a101e7..44a70a74 100644
--- a/frontend/src/locales/el.json
+++ b/frontend/src/locales/el.json
@@ -717,7 +717,8 @@
"add": "Νέα συλλογή",
"edit": "Επεξεργασία συλλογής",
"empty": "Δεν υπάρχουν συλλογές ακόμα. Δημιουργήστε μία για να ομαδοποιήσετε τους λογαριασμούς σας.",
- "accountCount": "{{count}} λογαριασμοί",
+ "accountCount_one": "{{count}} λογαριασμός",
+ "accountCount_other": "{{count}} λογαριασμοί",
"name": "Όνομα",
"namePlaceholder": "π.χ. Επαγγελματικοί, Μακροπρόθεσμοι, Ταμείο έκτακτης ανάγκης",
"color": "Χρώμα",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}} επιλεγμένοι",
"wallets": "Πορτοφόλια",
"walletsHint": "{{count}} επιλεγμένα",
- "walletCount": "{{count}} πορτοφόλια",
+ "walletCount_one": "{{count}} πορτοφόλι",
+ "walletCount_other": "{{count}} πορτοφόλια",
"noAccounts": "Δεν υπάρχουν λογαριασμοί ακόμα.",
"created": "Η συλλογή δημιουργήθηκε",
"updated": "Η συλλογή ενημερώθηκε",
@@ -900,6 +902,7 @@
"noManualAccounts": "Δεν υπάρχουν χειροκίνητοι λογαριασμοί ακόμα",
"noBankConnections": "Δεν υπάρχουν τραπεζικές συνδέσεις",
"noAccountsFound": "Δεν βρέθηκαν λογαριασμοί",
+ "emptyFiltered": "Δεν βρέθηκαν αποτελέσματα για αυτό το φίλτρο.",
"accountName": "Όνομα λογαριασμού",
"displayName": "Εμφανιζόμενο όνομα",
"displayNameHint": "Αντικαθιστά το προεπιλεγμένο όνομα του παρόχου παντού στην εφαρμογή.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 152e37f6..127d69cc 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -717,7 +717,8 @@
"add": "New collection",
"edit": "Edit collection",
"empty": "No collections yet. Create one to group your accounts.",
- "accountCount": "{{count}} accounts",
+ "accountCount_one": "{{count}} account",
+ "accountCount_other": "{{count}} accounts",
"name": "Name",
"namePlaceholder": "e.g. Business, Long-term, Emergency fund",
"color": "Color",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}} selected",
"wallets": "Wallets",
"walletsHint": "{{count}} selected",
- "walletCount": "{{count}} wallets",
+ "walletCount_one": "{{count}} wallet",
+ "walletCount_other": "{{count}} wallets",
"noAccounts": "No accounts yet.",
"created": "Collection created",
"updated": "Collection updated",
@@ -1169,6 +1171,7 @@
"noManualAccounts": "No manual accounts yet",
"noBankConnections": "No bank connections",
"noAccountsFound": "No accounts found",
+ "emptyFiltered": "Nothing matches this filter.",
"accountName": "Account name",
"displayName": "Display name",
"displayNameHint": "Overrides the default provider name everywhere in the app.",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index a37df1f5..4d5373ac 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -717,7 +717,9 @@
"add": "Nueva colección",
"edit": "Editar colección",
"empty": "Aún no hay colecciones. Crea una para agrupar tus cuentas.",
- "accountCount": "{{count}} cuentas",
+ "accountCount_one": "{{count}} cuenta",
+ "accountCount_many": "{{count}} cuentas",
+ "accountCount_other": "{{count}} cuentas",
"name": "Nombre",
"namePlaceholder": "p. ej. Empresa, Largo plazo, Fondo de emergencia",
"color": "Color",
@@ -725,7 +727,9 @@
"accountsHint": "{{count}} seleccionada(s)",
"wallets": "Carteras",
"walletsHint": "{{count}} seleccionada(s)",
- "walletCount": "{{count}} carteras",
+ "walletCount_one": "{{count}} cartera",
+ "walletCount_many": "{{count}} carteras",
+ "walletCount_other": "{{count}} carteras",
"noAccounts": "Aún no hay cuentas.",
"created": "Colección creada",
"updated": "Colección actualizada",
@@ -1160,6 +1164,7 @@
"balanceDate": "Fecha de saldo",
"lastSync": "Última sincronización",
"multiInstitutionLink_one": "{{provider}} · {{count}} institución",
+ "multiInstitutionLink_many": "{{provider}} · {{count}} instituciones",
"multiInstitutionLink_other": "{{provider}} · {{count}} instituciones",
"sync": "Sincronizar",
"disconnect": "Desconectar",
@@ -1170,6 +1175,7 @@
"noManualAccounts": "Aún no hay cuentas manuales",
"noBankConnections": "Sin conexiones bancarias",
"noAccountsFound": "No se encontraron cuentas",
+ "emptyFiltered": "Nada coincide con este filtro.",
"accountName": "Nombre de la cuenta",
"displayName": "Nombre para mostrar",
"displayNameHint": "Sobrescribe el nombre del proveedor por defecto en toda la app.",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 938ac20e..b3f3756a 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -717,7 +717,9 @@
"add": "Nouvelle collection",
"edit": "Modifier la collection",
"empty": "Aucune collection pour l'instant. Créez-en une pour regrouper vos comptes.",
- "accountCount": "{{count}} comptes",
+ "accountCount_one": "{{count}} compte",
+ "accountCount_many": "{{count}} comptes",
+ "accountCount_other": "{{count}} comptes",
"name": "Nom",
"namePlaceholder": "ex. Professionnel, Long terme, Fonds d'urgence",
"color": "Couleur",
@@ -725,7 +727,9 @@
"accountsHint": "{{count}} sélectionné(s)",
"wallets": "Portefeuilles",
"walletsHint": "{{count}} sélectionné(s)",
- "walletCount": "{{count}} portefeuilles",
+ "walletCount_one": "{{count}} portefeuille",
+ "walletCount_many": "{{count}} portefeuilles",
+ "walletCount_other": "{{count}} portefeuilles",
"noAccounts": "Aucun compte pour l'instant.",
"created": "Collection créée",
"updated": "Collection mise à jour",
@@ -1160,6 +1164,7 @@
"balanceDate": "Date du solde",
"lastSync": "Dernière synchronisation",
"multiInstitutionLink_one": "{{provider}} · {{count}} établissement",
+ "multiInstitutionLink_many": "{{provider}} · {{count}} établissements",
"multiInstitutionLink_other": "{{provider}} · {{count}} établissements",
"sync": "Synchroniser",
"disconnect": "Déconnecter",
@@ -1170,6 +1175,7 @@
"noManualAccounts": "Aucun compte manuel pour l'instant",
"noBankConnections": "Aucune connexion bancaire",
"noAccountsFound": "Aucun compte trouvé",
+ "emptyFiltered": "Rien ne correspond à ce filtre.",
"accountName": "Nom du compte",
"displayName": "Nom d'affichage",
"displayNameHint": "Remplace le nom du fournisseur par défaut partout dans l'application.",
diff --git a/frontend/src/locales/hi.json b/frontend/src/locales/hi.json
index c81f8993..863ca2a7 100644
--- a/frontend/src/locales/hi.json
+++ b/frontend/src/locales/hi.json
@@ -717,7 +717,8 @@
"add": "नया संग्रह",
"edit": "संग्रह संपादित करें",
"empty": "अभी कोई संग्रह नहीं। अपने खातों को समूहित करने के लिए एक बनाएँ।",
- "accountCount": "{{count}} खाते",
+ "accountCount_one": "{{count}} खाता",
+ "accountCount_other": "{{count}} खाते",
"name": "नाम",
"namePlaceholder": "जैसे, व्यवसाय, दीर्घकालिक, आपातकालीन कोष",
"color": "रंग",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}} चयनित",
"wallets": "वॉलेट",
"walletsHint": "{{count}} चयनित",
- "walletCount": "{{count}} वॉलेट",
+ "walletCount_one": "{{count}} वॉलेट",
+ "walletCount_other": "{{count}} वॉलेट",
"noAccounts": "अभी कोई खाता नहीं।",
"created": "संग्रह बना",
"updated": "संग्रह अपडेट हुआ",
@@ -1169,6 +1171,7 @@
"noManualAccounts": "अभी कोई मैन्युअल खाता नहीं",
"noBankConnections": "कोई बैंक कनेक्शन नहीं",
"noAccountsFound": "कोई खाता नहीं मिला",
+ "emptyFiltered": "इस फ़िल्टर से कुछ मेल नहीं खाता।",
"accountName": "खाते का नाम",
"displayName": "प्रदर्शित नाम",
"displayNameHint": "ऐप में हर जगह डिफ़ॉल्ट प्रदाता नाम को ओवरराइड करता है।",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 629e1a33..29994791 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -717,7 +717,9 @@
"add": "Nuova collezione",
"edit": "Modifica collezione",
"empty": "Ancora nessuna collezione. Creane una per raggruppare i tuoi conti.",
- "accountCount": "{{count}} conti",
+ "accountCount_one": "{{count}} conto",
+ "accountCount_many": "{{count}} conti",
+ "accountCount_other": "{{count}} conti",
"name": "Nome",
"namePlaceholder": "es. Azienda, Lungo termine, Fondo di emergenza",
"color": "Colore",
@@ -725,7 +727,9 @@
"accountsHint": "{{count}} selezionati",
"wallets": "Portafogli",
"walletsHint": "{{count}} selezionati",
- "walletCount": "{{count}} portafogli",
+ "walletCount_one": "{{count}} portafoglio",
+ "walletCount_many": "{{count}} portafogli",
+ "walletCount_other": "{{count}} portafogli",
"noAccounts": "Ancora nessun conto.",
"created": "Collezione creata",
"updated": "Collezione aggiornata",
@@ -1160,6 +1164,7 @@
"balanceDate": "Data del saldo",
"lastSync": "Ultima sincronizzazione",
"multiInstitutionLink_one": "{{provider}} · {{count}} istituto",
+ "multiInstitutionLink_many": "{{provider}} · {{count}} istituti",
"multiInstitutionLink_other": "{{provider}} · {{count}} istituti",
"sync": "Sincronizza",
"disconnect": "Disconnetti",
@@ -1170,6 +1175,7 @@
"noManualAccounts": "Ancora nessun conto manuale",
"noBankConnections": "Nessuna connessione bancaria",
"noAccountsFound": "Nessun conto trovato",
+ "emptyFiltered": "Nulla corrisponde a questo filtro.",
"accountName": "Nome del conto",
"displayName": "Nome visualizzato",
"displayNameHint": "Sostituisce il nome predefinito del provider ovunque nell'app.",
diff --git a/frontend/src/locales/ja.json b/frontend/src/locales/ja.json
index ceca1e96..821caa52 100644
--- a/frontend/src/locales/ja.json
+++ b/frontend/src/locales/ja.json
@@ -717,7 +717,8 @@
"add": "新規コレクション",
"edit": "コレクションを編集",
"empty": "コレクションはまだありません。作成して口座をまとめましょう。",
- "accountCount": "{{count}}口座",
+ "accountCount_one": "{{count}}口座",
+ "accountCount_other": "{{count}}口座",
"name": "名前",
"namePlaceholder": "例: ビジネス、長期、緊急予備金",
"color": "色",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}}件選択中",
"wallets": "ウォレット",
"walletsHint": "{{count}}件選択中",
- "walletCount": "{{count}}ウォレット",
+ "walletCount_one": "{{count}}ウォレット",
+ "walletCount_other": "{{count}}ウォレット",
"noAccounts": "口座はまだありません。",
"created": "コレクションを作成しました",
"updated": "コレクションを更新しました",
@@ -1169,6 +1171,7 @@
"noManualAccounts": "手動の口座はまだありません",
"noBankConnections": "銀行接続はありません",
"noAccountsFound": "口座が見つかりません",
+ "emptyFiltered": "このフィルタに一致するものはありません。",
"accountName": "口座名",
"displayName": "表示名",
"displayNameHint": "アプリ全体でプロバイダーの既定名を上書きします。",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index aad7ff60..03ba6cab 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -717,7 +717,8 @@
"add": "Nieuwe collectie",
"edit": "Verzameling bewerken",
"empty": "Nog geen collecties. Maak er een om uw accounts te groeperen.",
- "accountCount": "{{count}} accounts",
+ "accountCount_one": "{{count}} account",
+ "accountCount_other": "{{count}} accounts",
"name": "Naam",
"namePlaceholder": "bijv. Zakelijk, Lange termijn, Noodfonds",
"color": "Kleur",
@@ -725,7 +726,8 @@
"accountsHint": "{{count}} geselecteerd",
"wallets": "Portefeuilles",
"walletsHint": "{{count}} geselecteerd",
- "walletCount": "{{count}} portefeuilles",
+ "walletCount_one": "{{count}} portefeuille",
+ "walletCount_other": "{{count}} portefeuilles",
"noAccounts": "Nog geen accounts.",
"created": "Collectie gemaakt",
"updated": "Collectie bijgewerkt",
@@ -1170,6 +1172,7 @@
"noManualAccounts": "Nog geen handmatige accounts",
"noBankConnections": "Geen bankverbindingen",
"noAccountsFound": "Geen accounts gevonden",
+ "emptyFiltered": "Niets komt overeen met dit filter.",
"accountName": "Accountnaam",
"displayName": "Weergavenaam",
"displayNameHint": "Overschrijft overal in de app de standaardprovidernaam.",
diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.json
index 173e3933..980764dc 100644
--- a/frontend/src/locales/pl.json
+++ b/frontend/src/locales/pl.json
@@ -721,7 +721,10 @@
"add": "Nowa kolekcja",
"edit": "Edytuj kolekcję",
"empty": "Brak kolekcji. Utwórz jedną, aby pogrupować konta.",
- "accountCount": "{{count}} kont",
+ "accountCount_one": "{{count}} konto",
+ "accountCount_few": "{{count}} konta",
+ "accountCount_many": "{{count}} kont",
+ "accountCount_other": "{{count}} konta",
"name": "Nazwa",
"namePlaceholder": "np. Firma, Długoterminowe, Fundusz awaryjny",
"color": "Kolor",
@@ -729,7 +732,10 @@
"accountsHint": "Wybrano: {{count}}",
"wallets": "Portfele",
"walletsHint": "Wybrano: {{count}}",
- "walletCount": "{{count}} portfeli",
+ "walletCount_one": "{{count}} portfel",
+ "walletCount_few": "{{count}} portfele",
+ "walletCount_many": "{{count}} portfeli",
+ "walletCount_other": "{{count}} portfela",
"noAccounts": "Brak kont.",
"created": "Utworzono kolekcję",
"updated": "Zaktualizowano kolekcję",
@@ -1209,6 +1215,7 @@
"noManualAccounts": "Brak kont ręcznych",
"noBankConnections": "Brak połączeń bankowych",
"noAccountsFound": "Nie znaleziono kont",
+ "emptyFiltered": "Nic nie pasuje do tego filtra.",
"accountName": "Nazwa konta",
"displayName": "Nazwa wyświetlana",
"displayNameHint": "Zastępuje domyślną nazwę dostawcy wszędzie w aplikacji.",
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index ecc34434..f50be1ba 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -717,7 +717,9 @@
"add": "Nova coleção",
"edit": "Editar coleção",
"empty": "Nenhuma coleção ainda. Crie uma para agrupar suas contas.",
- "accountCount": "{{count}} contas",
+ "accountCount_one": "{{count}} conta",
+ "accountCount_many": "{{count}} contas",
+ "accountCount_other": "{{count}} contas",
"name": "Nome",
"namePlaceholder": "ex.: Empresa, Longo prazo, Reserva",
"color": "Cor",
@@ -725,7 +727,9 @@
"accountsHint": "{{count}} selecionada(s)",
"wallets": "Carteiras",
"walletsHint": "{{count}} selecionada(s)",
- "walletCount": "{{count}} carteiras",
+ "walletCount_one": "{{count}} carteira",
+ "walletCount_many": "{{count}} carteiras",
+ "walletCount_other": "{{count}} carteiras",
"noAccounts": "Nenhuma conta ainda.",
"created": "Coleção criada",
"updated": "Coleção atualizada",
@@ -1160,6 +1164,7 @@
"balanceDate": "Data do saldo",
"lastSync": "Última sincronização",
"multiInstitutionLink_one": "{{provider}} · {{count}} instituição",
+ "multiInstitutionLink_many": "{{provider}} · {{count}} instituições",
"multiInstitutionLink_other": "{{provider}} · {{count}} instituições",
"sync": "Sincronizar",
"disconnect": "Desconectar",
@@ -1170,6 +1175,7 @@
"noManualAccounts": "Nenhuma conta manual ainda",
"noBankConnections": "Nenhuma conexão bancária",
"noAccountsFound": "Nenhuma conta encontrada",
+ "emptyFiltered": "Nada corresponde a este filtro.",
"accountName": "Nome da conta",
"displayName": "Nome de exibição",
"displayNameHint": "Substitui o nome padrão do provedor em todo o sistema.",
diff --git a/frontend/src/locales/pt-PT.json b/frontend/src/locales/pt-PT.json
index 2f5951f1..57b94a83 100644
--- a/frontend/src/locales/pt-PT.json
+++ b/frontend/src/locales/pt-PT.json
@@ -717,7 +717,9 @@
"add": "Nova coleção",
"edit": "Editar coleção",
"empty": "Ainda não existem coleções. Cria uma para agrupar as tuas contas.",
- "accountCount": "{{count}} contas",
+ "accountCount_one": "{{count}} conta",
+ "accountCount_many": "{{count}} contas",
+ "accountCount_other": "{{count}} contas",
"name": "Nome",
"namePlaceholder": "ex.: Empresa, Longo prazo, Reserva",
"color": "Cor",
@@ -725,7 +727,9 @@
"accountsHint": "{{count}} selecionada(s)",
"wallets": "Carteiras",
"walletsHint": "{{count}} selecionada(s)",
- "walletCount": "{{count}} carteiras",
+ "walletCount_one": "{{count}} carteira",
+ "walletCount_many": "{{count}} carteiras",
+ "walletCount_other": "{{count}} carteiras",
"noAccounts": "Ainda não existem contas.",
"created": "Coleção criada",
"updated": "Coleção atualizada",
@@ -1160,6 +1164,7 @@
"balanceDate": "Data do saldo",
"lastSync": "Última sincronização",
"multiInstitutionLink_one": "{{provider}} · {{count}} instituição",
+ "multiInstitutionLink_many": "{{provider}} · {{count}} instituições",
"multiInstitutionLink_other": "{{provider}} · {{count}} instituições",
"sync": "Sincronizar",
"disconnect": "Desconectar",
@@ -1170,6 +1175,7 @@
"noManualAccounts": "Nenhuma conta manual ainda",
"noBankConnections": "Nenhuma ligação bancária",
"noAccountsFound": "Nenhuma conta encontrada",
+ "emptyFiltered": "Nada corresponde a este filtro.",
"accountName": "Nome da conta",
"displayName": "Nome a apresentar",
"displayNameHint": "Substitui o nome padrão do fornecedor em todo o sistema.",
diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json
index 8d9bbcfd..e5ff3aba 100644
--- a/frontend/src/locales/ru.json
+++ b/frontend/src/locales/ru.json
@@ -721,7 +721,10 @@
"add": "Новая коллекция",
"edit": "Редактировать коллекцию",
"empty": "Коллекций пока нет. Создайте одну, чтобы сгруппировать счета.",
- "accountCount": "{{count}} счетов",
+ "accountCount_one": "{{count}} счёт",
+ "accountCount_few": "{{count}} счёта",
+ "accountCount_many": "{{count}} счетов",
+ "accountCount_other": "{{count}} счёта",
"name": "Название",
"namePlaceholder": "например, Бизнес, Долгосрочные, Резервный фонд",
"color": "Цвет",
@@ -729,7 +732,10 @@
"accountsHint": "{{count}} выбрано",
"wallets": "Кошельки",
"walletsHint": "{{count}} выбрано",
- "walletCount": "{{count}} кошельков",
+ "walletCount_one": "{{count}} кошелёк",
+ "walletCount_few": "{{count}} кошелька",
+ "walletCount_many": "{{count}} кошельков",
+ "walletCount_other": "{{count}} кошелька",
"noAccounts": "Пока нет счетов.",
"created": "Коллекция создана",
"updated": "Коллекция обновлена",
@@ -1182,6 +1188,7 @@
"noManualAccounts": "Пока нет ручных счетов",
"noBankConnections": "Нет подключений к банкам",
"noAccountsFound": "Счета не найдены",
+ "emptyFiltered": "Ничего не соответствует этому фильтру.",
"accountName": "Название счёта",
"displayName": "Отображаемое имя",
"displayNameHint": "Переопределяет название, предоставленное провайдером, во всём приложении.",
diff --git a/frontend/src/locales/sk.json b/frontend/src/locales/sk.json
index 844ea2f4..b9f39549 100644
--- a/frontend/src/locales/sk.json
+++ b/frontend/src/locales/sk.json
@@ -721,7 +721,10 @@
"add": "Nová zbierka",
"edit": "Upraviť zbierku",
"empty": "Zatiaľ žiadne zbierky. Vytvor si jednu a zoskup svoje účty.",
- "accountCount": "{{count}} účtov",
+ "accountCount_one": "{{count}} účet",
+ "accountCount_few": "{{count}} účty",
+ "accountCount_many": "{{count}} účtu",
+ "accountCount_other": "{{count}} účtov",
"name": "Názov",
"namePlaceholder": "napr. Firma, Dlhodobé, Rezerva",
"color": "Farba",
@@ -729,7 +732,10 @@
"accountsHint": "{{count}} vybraných",
"wallets": "Peňaženky",
"walletsHint": "{{count}} vybraných",
- "walletCount": "{{count}} peňaženiek",
+ "walletCount_one": "{{count}} peňaženka",
+ "walletCount_few": "{{count}} peňaženky",
+ "walletCount_many": "{{count}} peňaženky",
+ "walletCount_other": "{{count}} peňaženiek",
"noAccounts": "Zatiaľ žiadne účty.",
"created": "Zbierka vytvorená",
"updated": "Zbierka aktualizovaná",
@@ -1221,6 +1227,7 @@
"noManualAccounts": "Zatiaľ žiadne manuálne účty",
"noBankConnections": "Žiadne prepojenia bánk",
"noAccountsFound": "Nenašli sa žiadne účty",
+ "emptyFiltered": "Tomuto filtru nič nezodpovedá.",
"accountName": "Názov účtu",
"displayName": "Zobrazovaný názov",
"displayNameHint": "Nahradí predvolený názov od poskytovateľa všade v aplikácii.",
diff --git a/frontend/src/locales/uk.json b/frontend/src/locales/uk.json
index 84175b9e..97c07de9 100644
--- a/frontend/src/locales/uk.json
+++ b/frontend/src/locales/uk.json
@@ -721,7 +721,10 @@
"add": "Нова колекція",
"edit": "Редагувати колекцію",
"empty": "Колекцій поки немає. Створіть одну, щоб згрупувати рахунки.",
- "accountCount": "{{count}} рахунків",
+ "accountCount_one": "{{count}} рахунок",
+ "accountCount_few": "{{count}} рахунки",
+ "accountCount_many": "{{count}} рахунків",
+ "accountCount_other": "{{count}} рахунка",
"name": "Назва",
"namePlaceholder": "наприклад, Бізнес, Довгострокові, Резервний фонд",
"color": "Колір",
@@ -729,7 +732,10 @@
"accountsHint": "{{count}} обрано",
"wallets": "Гаманці",
"walletsHint": "{{count}} обрано",
- "walletCount": "{{count}} гаманців",
+ "walletCount_one": "{{count}} гаманець",
+ "walletCount_few": "{{count}} гаманці",
+ "walletCount_many": "{{count}} гаманців",
+ "walletCount_other": "{{count}} гаманця",
"noAccounts": "Поки немає рахунків.",
"created": "Колекцію створено",
"updated": "Колекцію оновлено",
@@ -1182,6 +1188,7 @@
"noManualAccounts": "Поки немає ручних рахунків",
"noBankConnections": "Немає підключень до банків",
"noAccountsFound": "Рахунки не знайдено",
+ "emptyFiltered": "Ніщо не відповідає цьому фільтру.",
"accountName": "Назва рахунку",
"displayName": "Відображуване ім'я",
"displayNameHint": "Перевизначає назву, надану провайдером, у всьому застосунку.",
diff --git a/frontend/src/pages/accounts.tsx b/frontend/src/pages/accounts.tsx
index bf8c6cfe..7aa57519 100644
--- a/frontend/src/pages/accounts.tsx
+++ b/frontend/src/pages/accounts.tsx
@@ -37,6 +37,7 @@ import { TokenConnectDialog } from '@/components/token-connect-dialog'
import { ConnectionSettingsDialog } from '@/components/connection-settings-dialog'
import { usePrivacyMode } from '@/hooks/use-privacy-mode'
import { useAuth } from '@/contexts/auth-context'
+import { useCollectionFilter } from '@/contexts/collection-filter-context'
import { useWorkspace } from '@/contexts/workspace-context'
import { formatCurrency } from '@/lib/format'
@@ -66,7 +67,12 @@ export default function AccountsPage() {
const dateLocale = useDateLocale()
const { mask } = usePrivacyMode()
const { user } = useAuth()
+ const { activeAccountIds } = useCollectionFilter()
const { canWrite } = useWorkspace()
+ // The "Viewing" bar sits directly above this page, so its scope has to reach
+ // the lists too — the sidebar was already filtered, this page was not.
+ // null = no active collection = every account.
+ const inActiveCollection = (a: Account) => !activeAccountIds || activeAccountIds.includes(a.id)
const userCurrency = user?.preferences?.currency_display ?? 'USD'
const queryClient = useQueryClient()
const [dialogOpen, setDialogOpen] = useState(false)
@@ -128,7 +134,7 @@ export default function AccountsPage() {
queryKey: ['accounts', 'closed'],
queryFn: () => accounts.list(true),
})
- const closedAccounts = closedAccountsList?.filter((a) => a.is_closed) ?? []
+ const closedAccounts = closedAccountsList?.filter((a) => a.is_closed && inActiveCollection(a)) ?? []
const syncMutation = useMutation({
mutationFn: (id: string) => connections.sync(id),
@@ -218,8 +224,8 @@ export default function AccountsPage() {
})
const isLoading = accountsLoading || connectionsLoading
- const manualAccounts = accountsList?.filter((a) => a.connection_id === null) ?? []
- const bankAccounts = accountsList?.filter((a) => a.connection_id !== null) ?? []
+ const manualAccounts = accountsList?.filter((a) => a.connection_id === null && inActiveCollection(a)) ?? []
+ const bankAccounts = accountsList?.filter((a) => a.connection_id !== null && inActiveCollection(a)) ?? []
return (
<div className="space-y-6">
@@ -304,7 +310,9 @@ export default function AccountsPage() {
</div>
) : (
<div className="px-5 py-8 text-center">
- <p className="text-sm text-muted-foreground">{t('accounts.noManualAccounts')}</p>
+ <p className="text-sm text-muted-foreground">
+ {t(activeAccountIds ? 'accounts.emptyFiltered' : 'accounts.noManualAccounts')}
+ </p>
</div>
)}
</div>
@@ -451,7 +459,9 @@ export default function AccountsPage() {
</div>
) : (
<div className="px-5 py-4">
- <p className="text-sm text-muted-foreground">{t('accounts.noAccountsFound')}</p>
+ <p className="text-sm text-muted-foreground">
+ {t(activeAccountIds ? 'accounts.emptyFiltered' : 'accounts.noAccountsFound')}
+ </p>
</div>
)}
</div>