Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/converge-split-meow-currency-snapshot.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@app/split-meow': minor
---

每筆支出會保存記帳當下的幣別與匯率快照;歷史頁的韓元(KRW)支出會額外顯示對應的新台幣金額(≈ NT$),且日後匯率變動不影響既有紀錄的顯示。
38 changes: 25 additions & 13 deletions apps/split-meow/src/components/HistoryTab.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useTranslation } from 'react-i18next';
import { useStore, type Member, type ExpenseRecord } from '../store/useStore';
import { formatAmount, getCurrencySymbol } from '../config/currencies';
import { formatAmount, getCurrencySymbol, formatKrwAsTwd } from '../config/currencies';
import type { CurrencyCode } from '../config/currencies';
import { format } from 'date-fns';
import { useRef, useState } from 'react';
import { cn } from '../lib/utils';
Expand Down Expand Up @@ -177,6 +178,9 @@ export function HistoryTab() {
});
const totalSpent = tripExpenses.reduce((sum, e) => sum + e.totalAmount, 0);

const tripCurrency: CurrencyCode = tripExpenses[tripExpenses.length - 1]?.currency ?? currency;
const expenseCurrency = (exp: ExpenseRecord): CurrencyCode => exp.currency ?? tripCurrency;

// 計算各人餘額
const balances: Record<string, number> = {};
tripExpenses.forEach((exp) => {
Expand Down Expand Up @@ -215,7 +219,7 @@ export function HistoryTab() {
const lines: string[] = [
`🐾 喵喵分帳 — ${tripName}`,
`${'─'.repeat(24)}`,
`💰 總花費:${formatAmount(totalSpent, currency)}`,
`💰 總花費:${formatAmount(totalSpent, tripCurrency)}`,
'',
];
if (tripExpenses.length > 0) {
Expand All @@ -226,7 +230,9 @@ export function HistoryTab() {
const label =
exp.note ||
(exp.type === 'split_evenly' ? t('history.split_evenly') : t('history.itemized'));
lines.push(`${emoji} ${label} ${formatAmount(exp.totalAmount, currency)}(${payer} 付)`);
lines.push(
`${emoji} ${label} ${formatAmount(exp.totalAmount, expenseCurrency(exp))}(${payer} 付)`,
);
});
lines.push('');
}
Expand All @@ -235,7 +241,7 @@ export function HistoryTab() {
settlements.forEach((s) => {
const from = members.find((m) => m.id === s.from)?.name ?? s.from;
const to = members.find((m) => m.id === s.to)?.name ?? s.to;
lines.push(`${from} → ${to} ${formatAmount(s.amount, currency)}`);
lines.push(`${from} → ${to} ${formatAmount(s.amount, tripCurrency)}`);
});
lines.push('');
}
Expand Down Expand Up @@ -273,7 +279,7 @@ export function HistoryTab() {
{t('history.total_spent')}
</span>
<h2 className="text-4xl font-medium text-on-surface tracking-tight">
{formatAmount(totalSpent, currency)}
{formatAmount(totalSpent, tripCurrency)}
</h2>
</div>
<div className="mt-6 flex items-center justify-between gap-2">
Expand Down Expand Up @@ -376,7 +382,7 @@ export function HistoryTab() {
check_circle
</span>
) : (
formatAmount(s.amount, currency)
formatAmount(s.amount, tripCurrency)
)}
</span>
</div>
Expand Down Expand Up @@ -451,7 +457,7 @@ export function HistoryTab() {
)}
>
{isOwed ? '+' : '-'}
{formatAmount(Math.abs(amount), currency)}
{formatAmount(Math.abs(amount), tripCurrency)}
</span>
<span
className="material-symbols-outlined text-on-surface-variant text-lg transition-transform duration-300"
Expand Down Expand Up @@ -513,7 +519,7 @@ export function HistoryTab() {
{t('history.balance_paid')}
</span>
<span className="font-semibold text-secondary">
+{formatAmount(exp.totalAmount, currency)}
+{formatAmount(exp.totalAmount, expenseCurrency(exp))}
</span>
</div>
)}
Expand All @@ -528,7 +534,7 @@ export function HistoryTab() {
{t('history.balance_share')}
</span>
<span className="font-semibold text-error">
-{formatAmount(share, currency)}
-{formatAmount(share, expenseCurrency(exp))}
</span>
</div>
)}
Expand All @@ -549,7 +555,7 @@ export function HistoryTab() {
)}
>
{net > 0.01 ? '+' : net < -0.01 ? '-' : ''}
{formatAmount(Math.abs(net), currency)}
{formatAmount(Math.abs(net), expenseCurrency(exp))}
</span>
</div>
</div>
Expand All @@ -568,7 +574,7 @@ export function HistoryTab() {
)}
>
{isOwed ? '+' : '-'}
{formatAmount(Math.abs(amount), currency)}
{formatAmount(Math.abs(amount), tripCurrency)}
</span>
</div>
</div>
Expand Down Expand Up @@ -708,8 +714,14 @@ export function HistoryTab() {
<div className="text-right flex items-center gap-2 sm:gap-3 shrink-0">
<div className="shrink-0">
<p className="font-bold text-on-surface whitespace-nowrap text-base sm:text-lg">
{formatAmount(exp.totalAmount, currency)}
{formatAmount(exp.totalAmount, expenseCurrency(exp))}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Keep edit inputs on the expense snapshot currency

當使用者先以 KRW 記一筆、之後在設定切到 TWD 再編輯該筆時,列表現在會依 expenseCurrency(exp) 仍顯示 ₩,但下方 EditExpenseSheet 仍讀取目前全域 currency 來顯示輸入符號,而且 updateExpense 只更新金額欄位不更新幣別快照;使用者會在 NT$ 標示下輸入金額,儲存後卻被當成 KRW 顯示與結算。請讓編輯 sheet 使用該筆 expense 的 snapshot 幣別(或在編輯時同步更新 currency/exchangeRate)。

Useful? React with 👍 / 👎.

</p>
{expenseCurrency(exp) === 'KRW' &&
formatKrwAsTwd(exp.totalAmount, exp.exchangeRateKrwPerTwd) && (
<p className="text-[10px] font-medium text-on-surface-variant/70 whitespace-nowrap">
≈ {formatKrwAsTwd(exp.totalAmount, exp.exchangeRateKrwPerTwd)}
</p>
)}
<p className="text-[10px] font-medium text-secondary uppercase tracking-wider">
{t('history.participants', { count: exp.participantIds.length })}
</p>
Expand Down Expand Up @@ -830,7 +842,7 @@ export function HistoryTab() {
<span className="font-medium text-on-surface">{m.name}</span>
</div>
<span className="font-semibold text-on-surface">
{formatAmount(amt, currency)}
{formatAmount(amt, expenseCurrency(exp))}
</span>
</div>
);
Expand Down
26 changes: 25 additions & 1 deletion apps/split-meow/src/config/__tests__/currencies.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { describe, it, expect } from 'vitest';
import { formatAmount, detectCurrencyFromTimezone, getCurrencySymbol } from '../currencies';
import {
formatAmount,
formatKrwAsTwd,
detectCurrencyFromTimezone,
getCurrencySymbol,
} from '../currencies';

describe('formatAmount', () => {
it('TWD:以 NT$ 前綴格式化', () => {
Expand All @@ -23,6 +28,25 @@ describe('formatAmount', () => {
});
});

describe('formatKrwAsTwd', () => {
it('依匯率將 KRW 換算為 TWD 顯示字串', () => {
expect(formatKrwAsTwd(30000, 43.5)).toBe('NT$ 690');
});

it('匯率為 null 時回傳 null', () => {
expect(formatKrwAsTwd(30000, null)).toBeNull();
});

it('匯率為 0 或負值時回傳 null', () => {
expect(formatKrwAsTwd(30000, 0)).toBeNull();
expect(formatKrwAsTwd(30000, -1)).toBeNull();
});

it('匯率為 undefined(舊資料)時回傳 null', () => {
expect(formatKrwAsTwd(30000, undefined)).toBeNull();
});
});

describe('getCurrencySymbol', () => {
it('TWD → NT$', () => {
expect(getCurrencySymbol('TWD')).toBe('NT$');
Expand Down
5 changes: 5 additions & 0 deletions apps/split-meow/src/config/currencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,8 @@ export function formatAmount(amount: number, currency: CurrencyCode): string {
export function getCurrencySymbol(currency: CurrencyCode): string {
return CURRENCIES[currency].symbol;
}

export function formatKrwAsTwd(krwAmount: number, rate: number | null | undefined): string | null {
if (typeof rate !== 'number' || !Number.isFinite(rate) || rate <= 0) return null;
return formatAmount(krwAmount / rate, 'TWD');
}
16 changes: 16 additions & 0 deletions apps/split-meow/src/store/__tests__/useStore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,22 @@ describe('useStore', () => {
expect(useStore.getState().activeTab).toBe('history');
});

it('保存記帳當下的幣別與匯率快照(KRW)', () => {
useStore.setState({ calculatorValue: '30000', currency: 'KRW', krwPerTwd: 43.5 });
act(() => useStore.getState().saveExpense());
const exp = useStore.getState().expenses[0]!;
expect(exp.currency).toBe('KRW');
expect(exp.exchangeRateKrwPerTwd).toBe(43.5);
});

it('幣別快照不受日後切換幣別影響', () => {
useStore.setState({ calculatorValue: '1000', currency: 'TWD', krwPerTwd: null });
act(() => useStore.getState().saveExpense());
act(() => useStore.getState().setCurrency('KRW'));
const exp = useStore.getState().expenses[0]!;
expect(exp.currency).toBe('TWD');
});

it('儲存後清空計算機', () => {
useStore.setState({ calculatorValue: '100', expenseNote: '午餐' });
act(() => useStore.getState().saveExpense());
Expand Down
4 changes: 4 additions & 0 deletions apps/split-meow/src/store/useStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export interface ExpenseRecord {
note: string;
category?: ExpenseCategory;
createdAt: number;
currency?: CurrencyCode;
exchangeRateKrwPerTwd?: number | null;
}

export interface Trip {
Expand Down Expand Up @@ -266,6 +268,8 @@ export const useStore = create<AppState>()(
note: state.expenseNote.trim(),
...(state.expenseCategory ? { category: state.expenseCategory } : {}),
createdAt: Date.now(),
currency: state.currency,
exchangeRateKrwPerTwd: state.krwPerTwd,
};

return {
Expand Down
Loading