diff --git a/src/components/auth/LoginPage.tsx b/src/components/auth/LoginPage.tsx
index d62786b..1550eb2 100644
--- a/src/components/auth/LoginPage.tsx
+++ b/src/components/auth/LoginPage.tsx
@@ -3,7 +3,7 @@
import React, { useState, useEffect } from 'react';
import { useRouter } from 'next/navigation';
import { useGlobal } from '@/context/GlobalContext';
-import { useLogin } from '@/lib/hooks';
+import { useLogin, UserLevelType } from '@/lib/hooks';
import { useTranslation } from 'react-i18next';
import { Turnstile } from '@marsidev/react-turnstile';
import {
@@ -72,20 +72,20 @@ const LoginPage = () => {
const data = await loginMutation.mutateAsync({
email,
password: hashedPassword,
- code: step === 2 ? code : undefined,
- cf_turnstile_response: turnstileToken
+ code: step === 2 ? code : '',
+ cfTurnstileResponse: turnstileToken
});
// Login success
- if (!data || !data.user) {
+ if (!data || !data.auth || !data.auth.user) {
throw new Error('Invalid response format');
}
contextLogin({
- email: data.user.email,
- nickname: data.user.nickname,
- avatar: data.user.avatar,
- plan: data.user.plan
+ email: data.auth.user.email,
+ nickname: data.auth.user.nickname,
+ avatar: data.auth.user.avatar,
+ plan: data.auth.user.plan
});
toast.success(t('auth:login_success'), { duration: 4000 });
@@ -280,7 +280,7 @@ const LoginPage = () => {
variant="outline"
type="button"
onClick={() => {
- contextLogin({ email: 'github_user@example.com', nickname: 'GitHub User', plan: 'PRO' });
+ contextLogin({ email: 'github_user@example.com', nickname: 'GitHub User', plan: UserLevelType.USER_LEVEL_TYPE_PRO });
router.push('/dashboard');
}}
className="flex items-center justify-center gap-2 py-6 rounded-xl hover:bg-slate-50"
@@ -292,7 +292,7 @@ const LoginPage = () => {
variant="outline"
type="button"
onClick={() => {
- contextLogin({ email: 'wechat_user@example.com', nickname: t('auth:default_wechat_username'), plan: 'FREE' });
+ contextLogin({ email: 'wechat_user@example.com', nickname: t('auth:default_wechat_username'), plan: UserLevelType.USER_LEVEL_TYPE_FREE });
router.push('/dashboard');
}}
className="flex items-center justify-center gap-2 py-6 rounded-xl hover:bg-slate-50"
diff --git a/src/components/features/Accounts.tsx b/src/components/features/Accounts.tsx
index e30209e..5bdd166 100644
--- a/src/components/features/Accounts.tsx
+++ b/src/components/features/Accounts.tsx
@@ -1,9 +1,10 @@
'use client';
import React, { useState, useMemo } from 'react';
-import { useAllAccountsSuspense, Account } from '@/lib/hooks';
+import { useAllAccountsSuspense, Account, AccountType, Money } from '@/lib/hooks';
import { useTranslation } from 'react-i18next';
import { ACCOUNT_TYPES, EXCHANGE_RATES } from '@/lib/data';
+import { MoneyHelper } from '@/lib/utils/money';
import {
Plus,
Wallet,
@@ -23,6 +24,7 @@ import EditAccountModal from './EditAccountModal';
const Accounts = () => {
const { t } = useTranslation(['accounts', 'common']);
const { accounts } = useAllAccountsSuspense();
+ // We use string IDs for tabs, but map them to Enums for filtering
const [activeTab, setActiveTab] = useState('ALL');
const [page, setPage] = useState(1);
const [searchQuery, setSearchQuery] = useState('');
@@ -30,17 +32,39 @@ const Accounts = () => {
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
const itemsPerPage = 10;
- const formatCurrency = (amount: number, currency = 'CNY') => {
+ const formatCurrency = (amount: number | Money, currency = 'CNY') => {
+ let val = 0;
+ if (typeof amount === 'number') {
+ val = amount;
+ } else {
+ // Assume Money proto or undefined
+ val = MoneyHelper.from(amount).toNumber();
+ }
+
try {
- return new Intl.NumberFormat('zh-CN', { style: 'currency', currency }).format(amount);
+ return new Intl.NumberFormat('zh-CN', { style: 'currency', currency }).format(val);
} catch {
- return `${currency} ${amount.toFixed(2)}`;
+ return `${currency} ${val.toFixed(2)}`;
}
};
+ const tabToEnum: Record
= useMemo(() => ({
+ 'ASSET': AccountType.ACCOUNT_TYPE_ASSET,
+ 'LIABILITY': AccountType.ACCOUNT_TYPE_LIABILITY,
+ 'INCOME': AccountType.ACCOUNT_TYPE_INCOME,
+ 'EXPENSE': AccountType.ACCOUNT_TYPE_EXPENSE
+ }), []);
+
const topLevelAccounts = useMemo(() => {
let filtered = accounts.filter(a => !a.parentId);
- if (activeTab !== 'ALL') filtered = filtered.filter(a => a.type === activeTab);
+
+ if (activeTab !== 'ALL') {
+ const targetType = tabToEnum[activeTab];
+ if (targetType !== undefined) {
+ filtered = filtered.filter(a => a.type === targetType);
+ }
+ }
+
if (searchQuery.trim()) {
const query = searchQuery.toLowerCase();
filtered = filtered.filter(parent => {
@@ -49,14 +73,15 @@ const Accounts = () => {
return children.some(child => child.name.toLowerCase().includes(query));
});
}
- // Sort by created_at in descending order (newest first)
+ // Sort by createdAt in descending order (newest first)
filtered.sort((a, b) => {
- const dateA = a.created_at ? new Date(a.created_at).getTime() : 0;
- const dateB = b.created_at ? new Date(b.created_at).getTime() : 0;
+ // Ensure date handling is safe
+ const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+ const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
return dateB - dateA;
});
return filtered;
- }, [accounts, activeTab, searchQuery]);
+ }, [accounts, activeTab, searchQuery, tabToEnum]);
const totalPages = Math.ceil(topLevelAccounts.length / itemsPerPage);
@@ -74,14 +99,19 @@ const Accounts = () => {
];
const AccountRow = ({ account, isChild = false, groupBalance, hasChildren = false }: { account: Account, isChild?: boolean, groupBalance?: number, hasChildren?: boolean }) => {
- const TypeIcon = ACCOUNT_TYPES[account.type].icon;
- const typeMeta = ACCOUNT_TYPES[account.type];
+ const typeMeta = ACCOUNT_TYPES[account.type] || ACCOUNT_TYPES[AccountType.ACCOUNT_TYPE_ASSET];
+ const TypeIcon = typeMeta.icon;
const handleClick = () => {
setEditAccount(account);
setIsEditModalOpen(true);
};
+ // Safe access to currency
+ const currency = account.balance?.currencyCode || 'CNY';
+ // Safe access to balance value
+ const balanceVal = account.balance; // Money object
+
if (account.isGroup) {
const itemBg = hasChildren ? 'bg-[var(--bg-card)]' : 'bg-[var(--bg-main)]';
return (
@@ -124,17 +154,17 @@ const Accounts = () => {
{account.name}
- {account.currency !== 'CNY' && (
- {account.currency}
+ {currency !== 'CNY' && (
+ {currency}
)}
- {!isChild &&
{t('common:' + account.type.toLowerCase())}
}
+ {!isChild &&
{t('common:' + typeMeta.label.toLowerCase())}
}
-
{formatCurrency(account.balance, account.currency)}
- {account.currency !== 'CNY' && (
-
≈ {formatCurrency(account.balance * (EXCHANGE_RATES[account.currency] || 1), 'CNY')}
+
{formatCurrency(MoneyHelper.from(balanceVal).toNumber(), currency)}
+ {currency !== 'CNY' && (
+
≈ {formatCurrency(MoneyHelper.from(balanceVal).toNumber() * (EXCHANGE_RATES[currency] || 1), 'CNY')}
)}