Skip to content

fix(pulse/finances): non-USD amounts parse as zero, plus two adjacent data-loss bugs #1801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prafed wants to merge 2 commits into from
Closed

fix(pulse/finances): non-USD amounts parse as zero, plus two adjacent data-loss bugs #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8ec2a3
fix(pulse/finances): non-USD amounts parse as zero; outbound scope an…
prafed Aug 9, 2026
052e38e
feat(pulse/finances): render the currency from state.json instead of …
prafed Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions LifeOS/install/LIFEOS/PULSE/Observability/observability.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2120,13 +2120,18 @@ function parseCurrencyTable(content: string): { label: string; annual: number }[

function parseCurrencyCell(cell: string): number {
if (!cell) return 0
const cleaned = cell.replace(/\*\*/g, "").replace(/[~$,]/g, "").trim()
const km = cleaned.match(/^([\d.]+)\s*([KkMm])\b/)
// Strip £ and € alongside $. A GBP cell such as "£1,234" previously survived
// cleaning as "£1234", failed the leading-digit match and returned 0, so every
// row on a non-USD dashboard silently became zero rather than failing visibly.
// Also accept the Unicode minus (U+2212) so negative rows parse instead of
// being dropped by the `amount > 0` filter in parseCurrencyTable.
const cleaned = cell.replace(/\*\*/g, "").replace(/[~$£€,]/g, "").replace(/−/g, "-").trim()
const km = cleaned.match(/^(-?[\d.]+)\s*([KkMm])\b/)
if (km) {
const base = parseFloat(km[1])
return km[2].toLowerCase() === "m" ? base * 1_000_000 : base * 1_000
}
const plain = cleaned.match(/^[\d.]+/)
const plain = cleaned.match(/^-?[\d.]+/)
return plain ? parseFloat(plain[0]) : 0
}

Expand Down Expand Up @@ -2478,7 +2483,9 @@ function handleLifeFinances(): Response {
...o,
id: typeof o.id === "string" ? o.id : slugify(name),
name,
scope: "personal",
// Honour an explicit scope when the file states one. Hardcoding this
// mislabelled every business-paid obligation as personal.
scope: typeof (o as any).scope === "string" ? (o as any).scope : "personal",
cadence: o.cadence ?? FREQUENCY_TO_CADENCE[o.frequency] ?? "variable",
amount_usd: amount,
category: o.category ?? "other",
Expand Down Expand Up @@ -2540,7 +2547,9 @@ function handleLifeFinances(): Response {
return {
id: o.id,
name: o.name ?? o.id,
scope: "personal",
// Second place the same field was flattened; fixing only the normalizer
// above has no visible effect because this override runs after it.
scope: (o as any).scope ?? "personal",
monthly_usd: Math.round(monthly * 100) / 100,
annual_usd: Math.round(monthly * 12 * 100) / 100,
source: "manual",
Expand All @@ -2555,10 +2564,15 @@ function handleLifeFinances(): Response {
// Matching is case-insensitive substring in either direction.
// Guarded + empty-filtered: a missing id/name must neither throw nor add
// "" to the set (an empty known label substring-matches every expense row).
// Only suppress an EXPENSES.md row when the matching vendor/obligation actually
// contributes spend. A £0 "unconfigured" entry — every row of the shipped sample
// vendors.yaml, until a user clears it — has nothing to double-count, so letting
// it match silently deleted real expenses from the outbound total.
const contributes = (l: ResolvedLine) => l.monthly_usd > 0 || l.annual_usd > 0
const knownLabels = new Set<string>([
...resolvedVendors.map(v => (v.name ?? v.id ?? "").toLowerCase()),
...resolvedVendors.map(v => (v.id ?? v.name ?? "").toLowerCase()),
...resolvedObligations.map(o => (o.name ?? o.id ?? "").toLowerCase()),
...resolvedVendors.filter(contributes).map(v => (v.name ?? v.id ?? "").toLowerCase()),
...resolvedVendors.filter(contributes).map(v => (v.id ?? v.name ?? "").toLowerCase()),
...resolvedObligations.filter(contributes).map(o => (o.name ?? o.id ?? "").toLowerCase()),
].filter(Boolean))
const otherOutbound: ResolvedLine[] = expenseCategories
.filter(e => {
Expand Down
37 changes: 26 additions & 11 deletions LifeOS/install/LIFEOS/PULSE/Observability/src/app/finances/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ interface FinancesDataV2 {
targets: { headers: string[]; rows: string[][] } | null;
sections: Section[];
};
state?: { currency?: string; [k: string]: unknown };
incomeStreams?: Stream[];
expenseCategories?: Stream[];
annualIncome?: number;
Expand All @@ -183,20 +184,31 @@ interface FinancesDataV2 {

// ─── Formatting ───

function fmtHero(dollars: number | null | undefined): string {
const n = Number(dollars) || 0;
if (n >= 1_000_000) return `$${(n / 1_000_000).toFixed(1)}M`;
if (n >= 10_000) return `$${Math.round(n / 1000)}K`;
// Currency symbol, driven by state.json's `currency` field via the API payload.
// Defaults to "$" so an install that never sets it behaves exactly as before.
const CURRENCY_SYMBOLS: Record<string, string> = { USD: "$", GBP: "£", EUR: "€" };
let CURRENCY = "$";
let CURRENCY_LOCALE = "en-US";
export function setCurrency(code: string | null | undefined) {
if (!code) return;
CURRENCY = CURRENCY_SYMBOLS[code.toUpperCase()] ?? "$";
CURRENCY_LOCALE = code.toUpperCase() === "GBP" ? "en-GB" : "en-US";
}

function fmtHero(amount: number | null | undefined): string {
const n = Number(amount) || 0;
if (n >= 1_000_000) return `${CURRENCY}${(n / 1_000_000).toFixed(1)}M`;
if (n >= 10_000) return `${CURRENCY}${Math.round(n / 1000)}K`;
if (n >= 1_000) {
const k = n / 1000;
return k % 1 === 0 ? `$${k.toFixed(0)}K` : `$${k.toFixed(1)}K`;
return k % 1 === 0 ? `${CURRENCY}${k.toFixed(0)}K` : `${CURRENCY}${k.toFixed(1)}K`;
}
return `$${Math.round(n).toLocaleString()}`;
return `${CURRENCY}${Math.round(n).toLocaleString()}`;
}

function fmtExact(dollars: number | null | undefined): string {
const n = Number(dollars) || 0;
return `$${n.toLocaleString("en-US", { maximumFractionDigits: 0 })}`;
function fmtExact(amount: number | null | undefined): string {
const n = Number(amount) || 0;
return `${CURRENCY}${n.toLocaleString(CURRENCY_LOCALE, { maximumFractionDigits: 0 })}`;
}

function fmtPct(rate: number | null | undefined): string {
Expand Down Expand Up @@ -530,7 +542,7 @@ function TrendChart({ trend }: { trend: TrendPoint[] }) {
<YAxis
stroke="var(--ink-3)"
fontSize={11}
tickFormatter={(v) => `$${Math.round(v / 1000)}K`}
tickFormatter={(v) => `${CURRENCY}${Math.round(v / 1000)}K`}
/>
<Tooltip
contentStyle={{
Expand Down Expand Up @@ -1403,7 +1415,10 @@ export default function FinancesPage() {
useEffect(() => {
fetch("/api/life/finances")
.then((r) => (r.ok ? r.json() : Promise.reject(new Error(`HTTP ${r.status}`))))
.then(setData)
.then((d: FinancesDataV2) => {
setCurrency(d?.state?.currency);
setData(d);
})
.catch((e) => setError(String(e)));
}, []);

Expand Down