Skip to content

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

fix(dashboard): align dashboard and sidebar balance displays (#895)

Leonardo Zanivan76065dbcfa7c
diff --git a/frontend/src/components/app-layout.tsx b/frontend/src/components/app-layout.tsx
index 5ced4328..dfec088f 100644
--- a/frontend/src/components/app-layout.tsx
+++ b/frontend/src/components/app-layout.tsx
@@ -1,5 +1,5 @@
import { useState, useCallback, useEffect, useMemo, lazy, Suspense } from 'react'
-import { getAccountName, sumAccountBalances } from '@/lib/account-utils'
+import { getAccountName, sortAccountsByAbsoluteBalance, sumAccountBalances } from '@/lib/account-utils'
import { Link, Outlet, useLocation, useNavigate } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import { useDisplayLocale } from '@/hooks/use-display-locale'
@@ -513,8 +513,9 @@ export function AppLayout() {
</button>
{accountsExpanded && (
<div className="mt-1 space-y-0.5">
- {[...visibleAccounts].sort((a, b) => Math.abs(Number(b.current_balance)) - Math.abs(Number(a.current_balance))).slice(0, accountsShowAll ? visibleAccounts.length : 3).map((acc) => {
- const balance = Number(acc.current_balance) || 0
+ {sortAccountsByAbsoluteBalance(visibleAccounts, (a) => a.balance_primary ?? a.current_balance).slice(0, accountsShowAll ? visibleAccounts.length : 3).map((acc) => {
+ const balance = Number(acc.balance_primary ?? acc.current_balance) || 0
+ const balanceCurrency = acc.balance_primary != null ? userCurrency : acc.currency
const typeKey = acc.type.replace(/_([a-z])/g, (_, c: string) => c.toUpperCase()).replace(/^./, c => c.toUpperCase())
return (
@@ -533,7 +534,7 @@ export function AppLayout() {
</div>
<div className="text-right shrink-0 ml-2">
<span className={`block tabular-nums font-medium text-xs ${balance < 0 ? 'text-rose-400' : 'text-sidebar-foreground'}`}>
- {mask(formatCurrency(balance, acc.currency, locale))}
+ {mask(formatCurrency(balance, balanceCurrency, locale))}
</span>
</div>
</Link>
diff --git a/frontend/src/lib/account-utils.test.ts b/frontend/src/lib/account-utils.test.ts
index 70272427..e6aeda9e 100644
--- a/frontend/src/lib/account-utils.test.ts
+++ b/frontend/src/lib/account-utils.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest'
-import { sortAccountsByDisplayName } from './account-utils'
+import { sortAccountsByAbsoluteBalance, sortAccountsByDisplayName } from './account-utils'
describe('sortAccountsByDisplayName', () => {
it('orders accounts by display name when present and falls back to name', () => {
@@ -24,3 +24,57 @@ describe('sortAccountsByDisplayName', () => {
expect(accounts.map((account) => account.name)).toEqual(['Zulu', 'Alpha'])
})
})
+
+describe('sortAccountsByAbsoluteBalance', () => {
+ it('orders multi-currency accounts by the magnitude of their converted balances', () => {
+ const accounts = [
+ { id: 'brl', current_balance: '1000', balance_primary: 185 },
+ { id: 'eur', current_balance: '500', balance_primary: 580 },
+ { id: 'debt', current_balance: '-100', balance_primary: -700 },
+ ]
+
+ const sorted = sortAccountsByAbsoluteBalance(accounts, (a) => a.balance_primary ?? a.current_balance)
+
+ expect(sorted.map((a) => a.id)).toEqual(['debt', 'eur', 'brl'])
+ expect(accounts.map((a) => a.id)).toEqual(['brl', 'eur', 'debt'])
+ })
+
+ it('preserves converted zero and falls back only when the converted balance is missing', () => {
+ const accounts = [
+ { id: 'converted-zero', current_balance: '1000', balance_primary: 0 },
+ { id: 'null-conversion', current_balance: '200', balance_primary: null },
+ { id: 'no-conversion', current_balance: '300' },
+ { id: 'converted', current_balance: '500', balance_primary: 100 },
+ ]
+
+ expect(sortAccountsByAbsoluteBalance(accounts, (a) => a.balance_primary ?? a.current_balance)
+ .map((a) => a.id)).toEqual(['no-conversion', 'null-conversion', 'converted', 'converted-zero'])
+ })
+
+ it('orders positive and negative balances by magnitude', () => {
+ const accounts = [
+ { id: 'small-positive', current_balance: '8.22' },
+ { id: 'largest-positive', current_balance: '6936.72' },
+ { id: 'large-negative', current_balance: '-1200.50' },
+ { id: 'zero', current_balance: '0' },
+ ]
+
+ expect(sortAccountsByAbsoluteBalance(accounts).map((account) => account.id)).toEqual([
+ 'largest-positive',
+ 'large-negative',
+ 'small-positive',
+ 'zero',
+ ])
+ })
+
+ it('does not mutate the API account list', () => {
+ const accounts = [
+ { id: 'small', current_balance: 10 },
+ { id: 'large', current_balance: 20 },
+ ]
+
+ sortAccountsByAbsoluteBalance(accounts)
+
+ expect(accounts.map((account) => account.id)).toEqual(['small', 'large'])
+ })
+})
diff --git a/frontend/src/lib/account-utils.ts b/frontend/src/lib/account-utils.ts
index 95da8f26..b3ba59b5 100644
--- a/frontend/src/lib/account-utils.ts
+++ b/frontend/src/lib/account-utils.ts
@@ -37,6 +37,25 @@ export function sortAccountsByDisplayName<
)
}
+/**
+ * Return a presentation-only copy with the largest account balances first.
+ * Debt accounts participate by magnitude, matching the balance list in the
+ * sidebar, while invalid/missing balances sort as zero.
+ * Pass a selector to compare multi-currency accounts in a common currency.
+ */
+export function sortAccountsByAbsoluteBalance<
+ T extends { current_balance?: number | string | null },
+>(
+ accounts: readonly T[],
+ getBalance: (account: T) => number | string | null | undefined = (account) => account.current_balance,
+): T[] {
+ return [...accounts].sort((left, right) => {
+ const leftBalance = Number(getBalance(left)) || 0
+ const rightBalance = Number(getBalance(right)) || 0
+ return Math.abs(rightBalance) - Math.abs(leftBalance)
+ })
+}
+
/**
* The bank's identifier for an account, masked to its last 4 chars, e.g. "•••• 1234".
*
diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx
index 9733621a..b1a68ca2 100644
--- a/frontend/src/pages/dashboard.tsx
+++ b/frontend/src/pages/dashboard.tsx
@@ -1,5 +1,5 @@
import { useState, useEffect, useMemo, useRef } from 'react'
-import { getAccountLabel, getAccountName, sumAccountBalances } from '@/lib/account-utils'
+import { getAccountLabel, getAccountName, sortAccountsByAbsoluteBalance, sumAccountBalances } from '@/lib/account-utils'
import { currentMonth, shiftMonth, monthLastDay, monthLabel, monthRange } from '@/lib/month-utils'
import { useTranslation } from 'react-i18next'
import { useDisplayLocale, useDateLocale } from '@/hooks/use-display-locale'
@@ -405,6 +405,10 @@ export default function DashboardPage() {
const availableBalance = availableBalanceAccounts.reduce(
(sum, a) => sum + Number(a.balance_primary ?? a.current_balance), 0,
)
+ const sortedAvailableBalanceAccounts = useMemo(
+ () => sortAccountsByAbsoluteBalance(availableBalanceAccounts, (a) => a.balance_primary ?? a.current_balance),
+ [availableBalanceAccounts],
+ )
// While accounts are loading or failed to load, treat their balance
// components as unavailable rather than silently rendering zero.
const accountsUnavailable = accountsLoading || accountsError
@@ -669,9 +673,9 @@ export default function DashboardPage() {
<p className={`text-3xl font-bold tabular-nums leading-tight ${availableBalance < 0 ? 'text-rose-500' : 'text-foreground'}`}>
{mask(formatCurrency(availableBalance, primaryCurrency, locale))}
</p>
- {availableBalanceAccounts.length > 0 && (
+ {sortedAvailableBalanceAccounts.length > 0 && (
<div className="flex flex-wrap gap-1.5 mt-3">
- {availableBalanceAccounts.map((acc) => {
+ {sortedAvailableBalanceAccounts.map((acc) => {
const bal = Number(acc.balance_primary ?? acc.current_balance)
const balCurrency = acc.balance_primary != null ? primaryCurrency : acc.currency
// A link, not a click handler: the chip is a navigation
@@ -831,7 +835,7 @@ export default function DashboardPage() {
{summaryLoading || accountsUnavailable ? (
<Skeleton className="h-6 w-24" />
) : (
- <p className={`text-xl font-bold tabular-nums ${totalBalance < 0 ? 'text-rose-500' : 'text-foreground'}`}>
+ <p className={`text-lg sm:text-xl font-bold tabular-nums ${totalBalance < 0 ? 'text-rose-500' : 'text-foreground'}`}>
{mask(formatCurrency(totalBalance, primaryCurrency, locale))}
</p>
)}