Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 31 additions & 10 deletions frontend/components/custom/AccountAnalytics/AccountAnalytics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ import {
TableRow,
} from "@/components/ui/table";
import type { AccountAnalyticsListResponse } from "@/lib/models/analytics";
import { formatCurrency, getTransactionColor } from "@/lib/utils";
import {
formatCurrency,
formatPercentage,
getTransactionColor,
} from "@/lib/utils";
import { format } from "date-fns";
import { ChevronRight, Plus, Wallet } from "lucide-react";
import { useTheme } from "next-themes";
import Link from "next/link";
import { Fragment, useEffect, useState } from "react";

Expand All @@ -49,7 +52,6 @@ const accountColors = [
];

function AccountTransactions({ accountId }: AccountTransactionsProps) {
const { theme } = useTheme();
const { data, isLoading, error } = useTransactions({
account_id: accountId,
page: 1,
Expand Down Expand Up @@ -126,8 +128,7 @@ function AccountTransactions({ accountId }: AccountTransactionsProps) {
</div>
<div
className={`text-sm font-semibold ${getTransactionColor(
transaction.amount,
theme
transaction.amount
)}`}
>
{formatCurrency(Math.abs(transaction.amount))}
Expand Down Expand Up @@ -258,24 +259,33 @@ export function AccountAnalytics({ data }: AccountAnalyticsProps) {
);
const accountName = accountInfo?.name || `Account ${account.account_id}`;
const initialBalance = accountInfo?.balance || 0;
const isInvestment =
accountInfo?.bank_type === "investment" &&
account.current_value !== null &&
account.current_value !== undefined;

// Calculate the actual balance including initial balance
const actualBalance = account.current_balance + initialBalance;
const absoluteBalance = Math.abs(actualBalance);
const displayValue = isInvestment
? Number(account.current_value)
: absoluteBalance;

return {
...account,
accountName,
initialBalance,
actualBalance,
absoluteBalance,
displayValue,
isInvestment,
color: accountColors[index % accountColors.length],
};
});

// Calculate total balance from the actual balances
const totalBalance = accountsWithBalances.reduce(
(sum, account) => sum + account.absoluteBalance,
(sum, account) => sum + account.displayValue,
0
);

Expand All @@ -284,7 +294,7 @@ export function AccountAnalytics({ data }: AccountAnalyticsProps) {
.map((account) => ({
...account,
percentage:
totalBalance > 0 ? (account.absoluteBalance / totalBalance) * 100 : 0,
totalBalance > 0 ? (account.displayValue / totalBalance) * 100 : 0,
}))
.sort((a, b) => b.percentage - a.percentage); // Sort by percentage descending

Expand Down Expand Up @@ -464,9 +474,20 @@ export function AccountAnalytics({ data }: AccountAnalyticsProps) {
</div>
</TableCell>
<TableCell className="text-right">
<span className="font-medium">
{formatCurrency(account.absoluteBalance)}
</span>
<div className="flex flex-col items-end">
<span className="font-medium">
{formatCurrency(account.displayValue)}
</span>
{account.isInvestment && (
<span className="text-xs text-muted-foreground">
{formatPercentage(
account.percentage_increase ?? 0
)}
<span className="mx-1">•</span>
{formatPercentage(account.xirr ?? 0)}
</span>
)}
</div>
</TableCell>
</TableRow>
{isExpanded && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import type { Category } from "@/lib/models/category";
import { formatCurrency, getTransactionColor } from "@/lib/utils";
import { format } from "date-fns";
import { ChevronRight, FileQuestion, Plus, Tag } from "lucide-react";
import { useTheme } from "next-themes";
import Link from "next/link";
import { Fragment, useEffect, useState } from "react";

Expand Down Expand Up @@ -56,7 +55,6 @@ function CategoryTransactions({
categoryId,
isUncategorized,
}: CategoryTransactionsProps) {
const { theme } = useTheme();
const { data, isLoading, error } = useTransactions({
page: 1,
page_size: 5,
Expand Down Expand Up @@ -137,8 +135,7 @@ function CategoryTransactions({
</div>
<div
className={`text-sm font-semibold ${getTransactionColor(
transaction.amount,
theme
transaction.amount
)}`}
>
{formatCurrency(Math.abs(transaction.amount))}
Expand Down
Loading
Loading