Skip to content

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

feat: improve transaction import (#173) (#178)

Paulo Paesf99c23f007cb
diff --git a/backend/app/api/import_transactions.py b/backend/app/api/import_transactions.py
index 95f4d84c..ba9733ac 100644
--- a/backend/app/api/import_transactions.py
+++ b/backend/app/api/import_transactions.py
@@ -23,6 +23,7 @@ async def preview_import(
flip_amount: bool = Form(False),
inflow_column: Optional[str] = Form(None),
outflow_column: Optional[str] = Form(None),
+ session: AsyncSession = Depends(get_async_session),
user: User = Depends(current_active_user),
):
content = await file.read()
@@ -86,6 +87,10 @@ async def preview_import(
filename, detected_format, len(transactions),
)
+ transactions = await import_service.enrich_with_category_suggestions(
+ session, user.id, transactions,
+ )
+
return TransactionImportPreview(transactions=transactions, detected_format=detected_format)
@@ -100,10 +105,15 @@ async def import_transactions(
if not account:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")
- imported, skipped, import_log_id = await import_service.import_transactions(
+ imported, skipped, excluded, import_log_id = await import_service.import_transactions(
session, user.id, data.account_id, data.transactions, "import",
filename=data.filename, detected_format=data.detected_format,
detect_duplicates=data.detect_duplicates,
)
- return {"imported": imported, "skipped": skipped, "import_log_id": str(import_log_id)}
+ return {
+ "imported": imported,
+ "skipped": skipped,
+ "excluded": excluded,
+ "import_log_id": str(import_log_id),
+ }
diff --git a/backend/app/schemas/transaction.py b/backend/app/schemas/transaction.py
index 6bb5f4f3..20504082 100644
--- a/backend/app/schemas/transaction.py
+++ b/backend/app/schemas/transaction.py
@@ -142,6 +142,11 @@ class TransferRead(BaseModel):
class TransactionImport(TransactionBase):
"""TransactionBase extended with import-only fields not exposed in read responses."""
category_name: Optional[str] = None
+ suggested_category_id: Optional[uuid.UUID] = None
+ suggested_category_name: Optional[str] = None
+ excluded: bool = False
+ category_id: Optional[uuid.UUID] = None
+ force_uncategorized: bool = False
class TransactionImportPreview(BaseModel):
diff --git a/backend/app/services/import_service.py b/backend/app/services/import_service.py
index c4837b8b..514fcf24 100644
--- a/backend/app/services/import_service.py
+++ b/backend/app/services/import_service.py
@@ -11,12 +11,16 @@ from ofxparse import OfxParser
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
+from types import SimpleNamespace
+
from app.core.config import get_settings
from app.models.account import Account
from app.models.category import Category
+from app.models.rule import Rule
from app.models.transaction import Transaction
-from app.schemas.transaction import TransactionBase, TransactionImport
+from app.schemas.transaction import TransactionImport
from app.services.credit_card_service import apply_effective_date
+from app.services.rule_engine import apply_rule_actions, evaluate_conditions
from app.services.rule_service import apply_rules_to_transaction
from app.services.fx_rate_service import stamp_primary_amount
from app.services.payee_service import get_or_create_payee
@@ -428,22 +432,69 @@ def parse_csv(
return transactions
+async def enrich_with_category_suggestions(
+ session: AsyncSession,
+ user_id: uuid.UUID,
+ transactions: list[TransactionImport],
+) -> list[TransactionImport]:
+ result = await session.execute(
+ select(Rule)
+ .where(Rule.user_id == user_id, Rule.is_active == True)
+ .order_by(Rule.priority, Rule.id)
+ )
+ rules = result.scalars().all()
+
+ category_result = await session.execute(
+ select(Category).where(Category.user_id == user_id)
+ )
+ category_name_map = {str(c.id): c.name for c in category_result.scalars()}
+
+ if not rules:
+ return transactions
+
+ for txn in transactions:
+ proxy = SimpleNamespace(
+ description=txn.description,
+ amount=txn.amount,
+ date=txn.date,
+ type=txn.type,
+ account_id=None,
+ payee_id=None,
+ notes=None,
+ category_id=None,
+ )
+ category_set = False
+ for rule in rules:
+ conditions = rule.conditions or []
+ actions = rule.actions or []
+ if evaluate_conditions(rule.conditions_op, conditions, proxy):
+ category_set = apply_rule_actions(actions, proxy, category_set)
+ if proxy.category_id:
+ txn.suggested_category_id = proxy.category_id
+ txn.suggested_category_name = category_name_map.get(str(proxy.category_id))
+
+ return transactions
+
+
async def import_transactions(
session: AsyncSession,
user_id: uuid.UUID,
account_id: uuid.UUID,
- transactions: list[TransactionBase],
+ transactions: list[TransactionImport],
source: str,
filename: str = "",
detected_format: str = "",
detect_duplicates: bool = True,
-) -> tuple[int, int, uuid.UUID]:
- """Import transactions into an account. Returns (imported, skipped, import_log_id)."""
+) -> tuple[int, int, int, uuid.UUID]:
+ """Import transactions into an account. Returns (imported, skipped, excluded, import_log_id)."""
from app.models.import_log import ImportLog
- # Calculate summaries
- total_credit = sum(t.amount for t in transactions if t.type == "credit")
- total_debit = sum(t.amount for t in transactions if t.type == "debit")
+ included = [t for t in transactions if not t.excluded]
+ excluded_count = len(transactions) - len(included)
+
+ # Calculate summaries from included transactions only
+ total_credit = sum(t.amount for t in included if t.type == "credit")
+ total_debit = sum(t.amount for t in included if t.type == "debit")
# Create import log first to get its ID
import_log = ImportLog(
@@ -451,7 +502,7 @@ async def import_transactions(
account_id=account_id,
filename=filename,
format=detected_format,
- transaction_count=len(transactions),
+ transaction_count=len(included),
total_credit=total_credit,
total_debit=total_debit,
)
@@ -476,7 +527,7 @@ async def import_transactions(
effective_format = (detected_format or source or "").lower()
should_detect_duplicates = detect_duplicates if effective_format == "csv" else True
- for txn_data in transactions:
+ for txn_data in included:
# Resolve currency: CSV value > account currency
txn_currency = txn_data.currency or account_currency
@@ -516,7 +567,13 @@ async def import_transactions(
import_payee_entity = await get_or_create_payee(session, user_id, import_payee_raw)
import_payee_id = import_payee_entity.id
- category_id = category_map.get(getattr(txn_data, "category_name", None)) if getattr(txn_data, "category_name", None) else None
+ user_category_id = txn_data.category_id
+ suggested_cat_id = txn_data.suggested_category_id
+ csv_category_id = category_map.get(txn_data.category_name) if txn_data.category_name else None
+ if txn_data.force_uncategorized:
+ category_id = None
+ else:
+ category_id = user_category_id or suggested_cat_id or csv_category_id
transaction = Transaction(
user_id=user_id,
@@ -535,14 +592,14 @@ async def import_transactions(
)
apply_effective_date(transaction, account)
- # If CSV provided an fx_rate, use it directly
if txn_data.fx_rate:
transaction.fx_rate_used = txn_data.fx_rate
transaction.amount_primary = txn_data.amount * txn_data.fx_rate
session.add(transaction)
await session.flush()
- await apply_rules_to_transaction(session, user_id, transaction)
+
+ await apply_rules_to_transaction(session, user_id, transaction, skip_category_rules=txn_data.force_uncategorized)
# Only auto-convert if no fx_rate was provided by the CSV
if not txn_data.fx_rate:
@@ -554,7 +611,7 @@ async def import_transactions(
import_log.transaction_count = imported
await session.commit()
- return imported, skipped, import_log.id
+ return imported, skipped, excluded_count, import_log.id
def normalize_amount(amount_str: str) -> str:
"""
diff --git a/backend/app/services/rule_service.py b/backend/app/services/rule_service.py
index 3a7aabc1..a445851c 100644
--- a/backend/app/services/rule_service.py
+++ b/backend/app/services/rule_service.py
@@ -807,7 +807,8 @@ async def delete_rule(session: AsyncSession, rule_id: uuid.UUID, user_id: uuid.U
async def apply_rules_to_transaction(
- session: AsyncSession, user_id: uuid.UUID, transaction: Transaction
+ session: AsyncSession, user_id: uuid.UUID, transaction: Transaction,
+ skip_category_rules: bool = False,
) -> None:
"""Apply all active rules to a transaction, modifying it in-place. Commits nothing."""
result = await session.execute(
@@ -817,7 +818,7 @@ async def apply_rules_to_transaction(
)
rules = result.scalars().all()
- category_set = transaction.category_id is not None
+ category_set = transaction.category_id is not None or skip_category_rules
for rule in rules:
conditions = rule.conditions or []
diff --git a/backend/tests/test_import_api.py b/backend/tests/test_import_api.py
index 7a386b6e..da126fbe 100644
--- a/backend/tests/test_import_api.py
+++ b/backend/tests/test_import_api.py
@@ -208,3 +208,98 @@ async def test_delete_import_log(client: AsyncClient, auth_headers, test_account
logs_resp = await client.get("/api/import-logs", headers=auth_headers)
log_ids = [entry["id"] for entry in logs_resp.json()]
assert import_log_id not in log_ids
+
+
+async def test_preview_returns_suggested_categories(
+ client: AsyncClient, auth_headers, test_account, test_categories, test_rules
+):
+ csv_content = b"data,descricao,valor\n10/02/2026,UBER TRIP,-25.50\n12/02/2026,UNKNOWN TX,150.00\n"
+ response = await client.post(
+ "/api/transactions/import/preview",
+ headers=auth_headers,
+ files={"file": ("extrato.csv", csv_content, "text/csv")},
+ )
+ assert response.status_code == 200
+ data = response.json()
+ txns = data["transactions"]
+ assert len(txns) == 2
+
+ uber = txns[0]
+ assert uber["description"] == "UBER TRIP"
+ assert uber["suggested_category_id"] == str(test_categories[1].id)
+ assert uber["suggested_category_name"] == "Transporte"
+
+ unknown = txns[1]
+ assert unknown["description"] == "UNKNOWN TX"
+ assert unknown["suggested_category_id"] is None
+ assert unknown["suggested_category_name"] is None
+
+
+async def test_import_with_excluded_transactions(
+ client: AsyncClient, auth_headers, test_account: Account
+):
+ response = await client.post(
+ "/api/transactions/import",
+ headers=auth_headers,
+ json={
+ "account_id": str(test_account.id),
+ "transactions": [
+ {
+ "description": "INCLUDED",
+ "amount": "25.50",
+ "date": "2026-02-10",
+ "type": "debit",
+ "excluded": False,
+ },
+ {
+ "description": "EXCLUDED",
+ "amount": "100.00",
+ "date": "2026-02-11",
+ "type": "debit",
+ "excluded": True,
+ },
+ {
+ "description": "ALSO_INCLUDED",
+ "amount": "50.00",
+ "date": "2026-02-12",
+ "type": "credit",
+ "excluded": False,
+ },
+ ],
+ },
+ )
+ assert response.status_code == 201
+ data = response.json()
+ assert data["imported"] == 2
+ assert data["excluded"] == 1
+ assert data["skipped"] == 0
+
+
+async def test_import_with_category_override(
+ client: AsyncClient, auth_headers, test_account: Account, test_categories: list
+):
+ override_cat_id = str(test_categories[0].id)
+ response = await client.post(
+ "/api/transactions/import",
+ headers=auth_headers,
+ json={
+ "account_id": str(test_account.id),
+ "transactions": [
+ {
+ "description": "GROCERY",
+ "amount": "25.50",
+ "date": "2026-02-10",
+ "type": "debit",
+ "category_id": override_cat_id,
+ },
+ ],
+ },
+ )
+ assert response.status_code == 201
+ data = response.json()
+ assert data["imported"] == 1
+
+ import_log_id = data["import_log_id"]
+ logs_resp = await client.get("/api/import-logs", headers=auth_headers)
+ log = next(entry for entry in logs_resp.json() if entry["id"] == import_log_id)
+ assert log["transaction_count"] == 1
diff --git a/backend/tests/test_import_service.py b/backend/tests/test_import_service.py
index cbdd6d3e..7497524a 100644
--- a/backend/tests/test_import_service.py
+++ b/backend/tests/test_import_service.py
@@ -799,12 +799,12 @@ class TestImportTransactionsFx:
@patch("app.services.fx_rate_service._provider")
async def test_import_with_fx_rate_from_csv(self, mock_provider, session: AsyncSession, test_user: User, test_account: Account):
"""When CSV provides fx_rate, it should be used directly without calling FX service."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
txns = [
- TransactionBase(
+ TransactionImport(
description="Amazon US",
amount=Decimal("100.00"),
date=date(2026, 1, 15),
@@ -814,7 +814,7 @@ class TestImportTransactionsFx:
),
]
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "csv",
)
@@ -840,7 +840,7 @@ class TestImportTransactionsFx:
self, mock_provider, session: AsyncSession, test_user: User, test_account: Account,
):
"""When no fx_rate is provided, stamp_primary_amount should auto-convert using DB rates."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
@@ -853,7 +853,7 @@ class TestImportTransactionsFx:
mock_provider.fetch_historical = AsyncMock(return_value={})
txns = [
- TransactionBase(
+ TransactionImport(
description="Euro Store",
amount=Decimal("100.00"),
date=date(2026, 1, 15),
@@ -862,7 +862,7 @@ class TestImportTransactionsFx:
),
]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "csv",
)
@@ -884,7 +884,7 @@ class TestImportTransactionsFx:
self, mock_provider, session: AsyncSession, test_user: User,
):
"""When transaction has no currency, the account's currency should be used."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
@@ -908,7 +908,7 @@ class TestImportTransactionsFx:
mock_provider.fetch_historical = AsyncMock(return_value={})
txns = [
- TransactionBase(
+ TransactionImport(
description="ATM Withdrawal",
amount=Decimal("200.00"),
date=date(2026, 2, 10),
@@ -917,7 +917,7 @@ class TestImportTransactionsFx:
),
]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, usd_account.id, txns, "csv",
)
@@ -936,12 +936,12 @@ class TestImportTransactionsFx:
self, mock_provider, session: AsyncSession, test_user: User, test_account: Account,
):
"""Importing BRL transactions into a BRL account should not trigger FX conversion."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
txns = [
- TransactionBase(
+ TransactionImport(
description="Supermercado",
amount=Decimal("150.00"),
date=date(2026, 3, 1),
@@ -950,7 +950,7 @@ class TestImportTransactionsFx:
),
]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "csv",
)
@@ -974,7 +974,7 @@ class TestImportTransactionsFx:
self, mock_provider, session: AsyncSession, test_user: User, test_account: Account,
):
"""CSV-provided currency should take priority over account currency."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
@@ -985,7 +985,7 @@ class TestImportTransactionsFx:
mock_provider.fetch_historical = AsyncMock(return_value={})
txns = [
- TransactionBase(
+ TransactionImport(
description="London Hotel",
amount=Decimal("300.00"),
date=date(2026, 3, 5),
@@ -994,7 +994,7 @@ class TestImportTransactionsFx:
),
]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "csv",
)
@@ -1081,7 +1081,7 @@ class TestParseCsvTypeColumn:
class TestParseCsvCategoryColumn:
"""Tests for 'category' column support in parse_csv.
- The category column value is stored as category_name on TransactionBase
+ The category column value is stored as category_name on TransactionImport
and later resolved to a UUID by import_transactions.
"""
@@ -1164,7 +1164,7 @@ class TestImportTransactionsWithCategory:
category_name="Salário & Renda",
)]
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "import",
)
@@ -1194,7 +1194,7 @@ class TestImportTransactionsWithCategory:
category_name="Categoria Inexistente",
)]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "import",
)
@@ -1222,7 +1222,7 @@ class TestImportTransactionsWithCategory:
type="debit",
)]
- imported, _, _ = await import_transactions(
+ imported, _, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "import",
)
@@ -1280,7 +1280,7 @@ class TestImportTransactionsWithCategory:
),
]
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, txns, "import",
)
@@ -1335,7 +1335,7 @@ class TestImportTransactionsWithCategory:
assert transactions[0].category_name == "Salário & Renda"
assert transactions[1].category_name == "Moradia"
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, transactions, "import",
)
@@ -1364,12 +1364,12 @@ class TestOfxInstallmentDedup:
async def test_same_external_id_different_dates_both_imported(
self, session: AsyncSession, test_user: User, test_account: Account,
):
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
from app.models.transaction import Transaction
from sqlalchemy import select
first = [
- TransactionBase(
+ TransactionImport(
description="Nimbus Stay - Parcela 1/6",
amount=Decimal("100.00"),
date=date(2025, 12, 15),
@@ -1377,14 +1377,14 @@ class TestOfxInstallmentDedup:
external_id="PURCHASE_ABC123",
),
]
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, first, "ofx",
)
assert imported == 1
assert skipped == 0
second = [
- TransactionBase(
+ TransactionImport(
description="Nimbus Stay - Parcela 2/6",
amount=Decimal("100.00"),
date=date(2026, 1, 15),
@@ -1392,7 +1392,7 @@ class TestOfxInstallmentDedup:
external_id="PURCHASE_ABC123", # bank reuses purchase FITID
),
]
- imported2, skipped2, _ = await import_transactions(
+ imported2, skipped2, _, _ = await import_transactions(
session, test_user.id, test_account.id, second, "ofx",
)
assert imported2 == 1
@@ -1410,9 +1410,9 @@ class TestOfxInstallmentDedup:
):
"""Re-importing the same OFX file must still dedup — same FITID + same
date is the strict duplicate case."""
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
- txn = TransactionBase(
+ txn = TransactionImport(
description="Padaria",
amount=Decimal("12.50"),
date=date(2026, 2, 10),
@@ -1420,7 +1420,7 @@ class TestOfxInstallmentDedup:
external_id="DEDUP_ME",
)
await import_transactions(session, test_user.id, test_account.id, [txn], "ofx")
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session, test_user.id, test_account.id, [txn], "ofx",
)
assert imported == 0
@@ -1432,9 +1432,9 @@ class TestCsvDuplicateDetectionToggle:
async def test_csv_detect_duplicates_false_allows_duplicates(
self, session: AsyncSession, test_user: User, test_account: Account,
):
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
- txn = TransactionBase(
+ txn = TransactionImport(
description="CSV DUP TOGGLE",
amount=Decimal("42.00"),
date=date(2026, 3, 10),
@@ -1450,7 +1450,7 @@ class TestCsvDuplicateDetectionToggle:
detected_format="csv",
detect_duplicates=False,
)
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session,
test_user.id,
test_account.id,
@@ -1466,9 +1466,9 @@ class TestCsvDuplicateDetectionToggle:
async def test_non_csv_ignores_toggle_and_still_dedups(
self, session: AsyncSession, test_user: User, test_account: Account,
):
- from app.schemas.transaction import TransactionBase
+ from app.schemas.transaction import TransactionImport
- txn = TransactionBase(
+ txn = TransactionImport(
description="OFX DUP",
amount=Decimal("15.00"),
date=date(2026, 3, 11),
@@ -1485,7 +1485,7 @@ class TestCsvDuplicateDetectionToggle:
detected_format="ofx",
detect_duplicates=False,
)
- imported, skipped, _ = await import_transactions(
+ imported, skipped, _, _ = await import_transactions(
session,
test_user.id,
test_account.id,
@@ -1496,3 +1496,342 @@ class TestCsvDuplicateDetectionToggle:
)
assert imported == 0
assert skipped == 1
+
+
+class TestApplyRuleEngineCorrectly:
+ @pytest.mark.asyncio
+ async def test_should_not_override_category(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.schemas.transaction import TransactionImport
+ from app.schemas.rule import RuleCreate, RuleCondition, RuleAction
+ from app.services.rule_service import create_rule
+ from app.models.transaction import Transaction
+ from sqlalchemy import select
+ from app.services.category_service import create_default_categories
+
+ test_categories = await create_default_categories(session, test_user.id)
+
+ data = RuleCreate(
+ name="My Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="NOOVERRIDE")],
+ actions=[RuleAction(op="set_category", value=str(test_categories[2].id))],
+ priority=10,
+ )
+ await create_rule(session, test_user.id, data)
+
+ txn = TransactionImport(
+ description="NOOVERRIDE",
+ amount=Decimal("15.00"),
+ date=date(2026, 3, 11),
+ type="debit",
+ suggested_category_id = test_categories[1].id
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session,
+ test_user.id,
+ test_account.id,
+ [txn],
+ "ofx",
+ detected_format="ofx",
+ detect_duplicates=False,
+ )
+
+ result = await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )
+ txn = result.scalar_one()
+ assert imported == 1
+ assert txn.category_id == test_categories[1].id
+
+ @pytest.mark.asyncio
+ async def test_should_set_category_from_rule_when_no_suggested(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.schemas.transaction import TransactionImport
+ from app.schemas.rule import RuleCreate, RuleCondition, RuleAction
+ from app.services.rule_service import create_rule
+ from app.models.transaction import Transaction
+ from sqlalchemy import select
+ from app.services.category_service import create_default_categories
+
+ test_categories = await create_default_categories(session, test_user.id)
+ data = RuleCreate(
+ name="My Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="SETCAT")],
+ actions=[RuleAction(op="set_category", value=str(test_categories[1].id))],
+ priority=10,
+ )
+
+ await create_rule(session, test_user.id, data)
+
+ txn = TransactionImport(
+ description="SETCAT",
+ amount=Decimal("15.00"),
+ date=date(2026, 3, 11),
+ type="debit",
+ suggested_category_id = None
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session,
+ test_user.id,
+ test_account.id,
+ [txn],
+ "ofx",
+ detected_format="ofx",
+ detect_duplicates=False,
+ )
+
+ result = await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )
+ txn = result.scalar_one()
+
+ assert imported == 1
+ assert txn.category_id == test_categories[1].id
+
+ @pytest.mark.asyncio
+ async def test_should_set_payee_but_not_override_category(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.models.payee import Payee
+ from app.schemas.transaction import TransactionImport
+ from app.schemas.rule import RuleCreate, RuleCondition, RuleAction
+ from app.services.rule_service import create_rule
+ from app.models.transaction import Transaction
+ from sqlalchemy import select
+ from app.services.category_service import create_default_categories
+
+ test_categories = await create_default_categories(session, test_user.id)
+ payee = Payee(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="Uber",
+ type="merchant",
+ )
+
+ session.add(payee)
+ await session.commit()
+ await session.refresh(payee)
+
+ cat_rule = RuleCreate(
+ name="My Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="SETCAT")],
+ actions=[RuleAction(op="set_category", value=str(test_categories[1].id))],
+ priority=10,
+ )
+ data = RuleCreate(
+ name="Uber Payee Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="PAYEECAT")],
+ actions=[RuleAction(op="set_payee", value=str(payee.id))],
+ priority=10,
+ )
+ await create_rule(session, test_user.id, data)
+ await create_rule(session, test_user.id, cat_rule)
+
+
+ txn = TransactionImport(
+ description="PAYEECAT",
+ amount=Decimal("25.00"),
+ date=date(2026, 3, 12),
+ type="debit",
+ suggested_category_id=test_categories[2].id,
+ )
+ imported, _, _, import_log_id = await import_transactions(
+ session,
+ test_user.id,
+ test_account.id,
+ [txn],
+ "ofx",
+ detected_format="ofx",
+ detect_duplicates=False,
+ )
+
+ result = await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )
+ tx = result.scalar_one()
+
+ assert imported == 1
+ assert tx.payee_id == payee.id
+ assert tx.category_id == test_categories[2].id
+
+
+class TestForceUncategorized:
+ """Tests for force_uncategorized flag preventing category assignment."""
+
+ @pytest.mark.asyncio
+ async def test_force_uncategorized_ignores_suggestion(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.schemas.transaction import TransactionImport
+ from app.models.transaction import Transaction
+ from app.models.category import Category
+ from sqlalchemy import select
+
+ cat = Category(
+ id=uuid.uuid4(), user_id=test_user.id,
+ name="Groceries", icon="cart", color="#16A34A",
+ )
+ session.add(cat)
+ await session.commit()
+
+ txn = TransactionImport(
+ description="FORCE UNCATEGORIZED",
+ amount=Decimal("50.00"),
+ date=date(2026, 4, 1),
+ type="debit",
+ suggested_category_id=cat.id,
+ force_uncategorized=True,
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session, test_user.id, test_account.id, [txn], "import",
+ )
+
+ assert imported == 1
+
+ tx = (await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )).scalar_one()
+ assert tx.category_id is None
+
+ @pytest.mark.asyncio
+ async def test_force_uncategorized_prevents_rule_override(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.schemas.transaction import TransactionImport
+ from app.models.transaction import Transaction
+ from sqlalchemy import select
+ from app.services.category_service import create_default_categories
+ from app.schemas.rule import RuleCreate, RuleCondition, RuleAction
+ from app.services.rule_service import create_rule
+
+ test_categories = await create_default_categories(session, test_user.id)
+
+ data = RuleCreate(
+ name="Force Cat Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="FORCED")],
+ actions=[RuleAction(op="set_category", value=str(test_categories[1].id))],
+ priority=10,
+ )
+ await create_rule(session, test_user.id, data)
+
+ txn = TransactionImport(
+ description="FORCED NO CAT",
+ amount=Decimal("30.00"),
+ date=date(2026, 4, 2),
+ type="debit",
+ suggested_category_id=test_categories[0].id,
+ force_uncategorized=True,
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session, test_user.id, test_account.id, [txn], "import",
+ )
+
+ assert imported == 1
+
+ tx = (await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )).scalar_one()
+ assert tx.category_id is None
+
+ @pytest.mark.asyncio
+ async def test_force_uncategorized_still_applies_payee_rules(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.models.payee import Payee
+ from app.schemas.transaction import TransactionImport
+ from app.models.transaction import Transaction
+ from sqlalchemy import select
+ from app.services.category_service import create_default_categories
+ from app.schemas.rule import RuleCreate, RuleCondition, RuleAction
+ from app.services.rule_service import create_rule
+
+ test_categories = await create_default_categories(session, test_user.id)
+
+ payee = Payee(
+ id=uuid.uuid4(),
+ user_id=test_user.id,
+ name="Test Merchant",
+ type="merchant",
+ )
+ session.add(payee)
+ await session.commit()
+ await session.refresh(payee)
+
+ data = RuleCreate(
+ name="Payee + Cat Rule",
+ conditions_op="or",
+ conditions=[RuleCondition(field="description", op="contains", value="PAYEEFORCE")],
+ actions=[
+ RuleAction(op="set_payee", value=str(payee.id)),
+ RuleAction(op="set_category", value=str(test_categories[1].id)),
+ ],
+ priority=10,
+ )
+ await create_rule(session, test_user.id, data)
+
+ txn = TransactionImport(
+ description="PAYEEFORCE TXN",
+ amount=Decimal("75.00"),
+ date=date(2026, 4, 3),
+ type="debit",
+ suggested_category_id=test_categories[0].id,
+ force_uncategorized=True,
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session, test_user.id, test_account.id, [txn], "import",
+ )
+
+ assert imported == 1
+
+ tx = (await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )).scalar_one()
+ assert tx.category_id is None
+ assert tx.payee_id == payee.id
+
+ @pytest.mark.asyncio
+ async def test_without_force_uncategorized_suggestion_is_used(
+ self, session: AsyncSession, test_user: User, test_account: Account
+ ):
+ from app.schemas.transaction import TransactionImport
+ from app.models.transaction import Transaction
+ from app.models.category import Category
+ from sqlalchemy import select
+
+ cat = Category(
+ id=uuid.uuid4(), user_id=test_user.id,
+ name="Transport", icon="car", color="#3B82F6",
+ )
+ session.add(cat)
+ await session.commit()
+
+ txn = TransactionImport(
+ description="NORMAL TXN",
+ amount=Decimal("40.00"),
+ date=date(2026, 4, 4),
+ type="debit",
+ suggested_category_id=cat.id,
+ )
+
+ imported, _, _, import_log_id = await import_transactions(
+ session, test_user.id, test_account.id, [txn], "import",
+ )
+
+ assert imported == 1
+
+ tx = (await session.execute(
+ select(Transaction).where(Transaction.import_id == import_log_id)
+ )).scalar_one()
+ assert tx.category_id == cat.id
\ No newline at end of file
diff --git a/frontend/src/components/category-filter-content.tsx b/frontend/src/components/category-filter-content.tsx
new file mode 100644
index 00000000..6e1815d2
--- /dev/null
+++ b/frontend/src/components/category-filter-content.tsx
@@ -0,0 +1,121 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { X } from 'lucide-react'
+import {
+ DropdownMenuCheckboxItem,
+ DropdownMenuGroup,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+} from '@/components/ui/dropdown-menu'
+import type { Category, CategoryGroup } from '@/types'
+
+function toggleInArray(arr: string[], id: string): string[] {
+ return arr.includes(id) ? arr.filter((x) => x !== id) : [...arr, id]
+}
+
+interface CategoryFilterContentProps {
+ categoryIds: string[]
+ onCategoryIdsChange: (ids: string[]) => void
+ filterUncategorized: boolean
+ onUncategorizedChange: (value: boolean) => void
+ categories: Category[]
+ groups: CategoryGroup[]
+ onKeepOpen?: () => void
+}
+
+export function CategoryFilterContent({
+ categoryIds,
+ onCategoryIdsChange,
+ filterUncategorized,
+ onUncategorizedChange,
+ categories,
+ groups,
+ onKeepOpen,
+}: CategoryFilterContentProps) {
+ const { t } = useTranslation()
+
+ const displayCategoryGroups = useMemo(() => {
+ const ungrouped = (categories ?? []).filter((c) => !c.group_id)
+ if (ungrouped.length === 0) return groups
+
+ return [
+ ...groups,
+ {
+ id: 'ungrouped-virtual',
+ name: t('groups.noGroup'),
+ categories: ungrouped,
+ } as CategoryGroup,
+ ]
+ }, [categories, groups, t])
+
+ return (
+ <>
+ <DropdownMenuCheckboxItem
+ checked={filterUncategorized}
+ onSelect={(e) => {
+ e.preventDefault()
+ onKeepOpen?.()
+ onUncategorizedChange(!filterUncategorized)
+ }}
+ className="gap-2 rounded-sm py-1.5 text-[13px]"
+ >
+ <span className="min-w-0 flex-1 truncate text-left italic text-muted-foreground">
+ {t('transactions.uncategorized')}
+ </span>
+ </DropdownMenuCheckboxItem>
+ <div className="my-1 h-px bg-border/60" />
+ {displayCategoryGroups.length === 0 ? (
+ <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
+ {t('transactions.filtersBar.noOptions')}
+ </div>
+ ) : (
+ displayCategoryGroups.map((group) => (
+ <DropdownMenuGroup key={group.id}>
+ <DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">
+ {group.name}
+ </DropdownMenuLabel>
+ {group.categories.map((c) => (
+ <DropdownMenuCheckboxItem
+ key={c.id}
+ checked={categoryIds.includes(c.id)}
+ onSelect={(e) => {
+ e.preventDefault()
+ onKeepOpen?.()
+ onCategoryIdsChange(toggleInArray(categoryIds, c.id))
+ }}
+ className="gap-2 rounded-sm py-1.5 text-[13px]"
+ >
+ {c.color ? (
+ <span
+ className="size-2.5 shrink-0 rounded-full border border-black/5"
+ style={{ backgroundColor: c.color }}
+ />
+ ) : null}
+ <span className="min-w-0 flex-1 truncate text-left">
+ {c.name}
+ </span>
+ </DropdownMenuCheckboxItem>
+ ))}
+ </DropdownMenuGroup>
+ ))
+ )}
+ {(categoryIds.length > 0 || filterUncategorized) && (
+ <>
+ <div className="my-1 h-px bg-border/60" />
+ <DropdownMenuItem
+ onSelect={(e) => {
+ e.preventDefault()
+ onKeepOpen?.()
+ onCategoryIdsChange([])
+ onUncategorizedChange(false)
+ }}
+ className="gap-2 rounded-sm px-2 py-1.5 text-[12px] text-muted-foreground"
+ >
+ <X size={12} />
+ {t('transactions.filtersBar.clearSelection')}
+ </DropdownMenuItem>
+ </>
+ )}
+ </>
+ )
+}
diff --git a/frontend/src/components/category-filter-dropdown.tsx b/frontend/src/components/category-filter-dropdown.tsx
new file mode 100644
index 00000000..e32442f5
--- /dev/null
+++ b/frontend/src/components/category-filter-dropdown.tsx
@@ -0,0 +1,81 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Tag, ChevronDown } from 'lucide-react'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { CategoryFilterContent } from '@/components/category-filter-content'
+import type { Category, CategoryGroup } from '@/types'
+
+interface CategoryFilterDropdownProps {
+ categoryIds: string[]
+ onCategoryIdsChange: (ids: string[]) => void
+ filterUncategorized: boolean
+ onUncategorizedChange: (value: boolean) => void
+ categories: Category[]
+ groups: CategoryGroup[]
+ label?: string
+ triggerClassName?: string
+}
+
+export function CategoryFilterDropdown({
+ categoryIds,
+ onCategoryIdsChange,
+ filterUncategorized,
+ onUncategorizedChange,
+ categories,
+ groups,
+ label,
+ triggerClassName,
+}: CategoryFilterDropdownProps) {
+ const { t } = useTranslation()
+
+ const categoryById = useMemo(() => {
+ const map = new Map<string, Category>()
+ categories.forEach((c) => map.set(c.id, c))
+ return map
+ }, [categories])
+
+ const summary = useMemo(() => {
+ const total = categoryIds.length + (filterUncategorized ? 1 : 0)
+ if (total > 1) return t('transactions.filtersBar.nSelected', { count: total })
+ if (filterUncategorized) return t('transactions.uncategorized')
+ if (categoryIds.length === 1) return categoryById.get(categoryIds[0])?.name ?? ''
+ return ''
+ }, [categoryIds, filterUncategorized, categoryById, t])
+
+ const displayLabel = label ?? t('transactions.category')
+ const hasFilter = categoryIds.length > 0 || filterUncategorized
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ type="button"
+ className={
+ triggerClassName ??
+ `inline-flex min-w-[10rem] h-8 items-center gap-1.5 justify-between rounded-md border border-border px-3 text-sm bg-background hover:bg-muted transition-colors focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]`
+ }
+ >
+ <Tag size={13} className="text-muted-foreground" />
+ <span className={`flex-1 text-left ${hasFilter ? 'text-foreground' : 'text-muted-foreground'}`}>
+ {summary || displayLabel}
+ </span>
+ <ChevronDown size={12} className="text-muted-foreground" />
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start" className="max-h-[320px] w-[240px] overflow-y-auto p-1">
+ <CategoryFilterContent
+ categoryIds={categoryIds}
+ onCategoryIdsChange={onCategoryIdsChange}
+ filterUncategorized={filterUncategorized}
+ onUncategorizedChange={onUncategorizedChange}
+ categories={categories}
+ groups={groups}
+ />
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
diff --git a/frontend/src/components/import-review-table.tsx b/frontend/src/components/import-review-table.tsx
new file mode 100644
index 00000000..3dee0798
--- /dev/null
+++ b/frontend/src/components/import-review-table.tsx
@@ -0,0 +1,222 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import type { ImportReviewTransaction, Category, CategoryGroup } from '@/types'
+import { formatCurrency } from '@/lib/format'
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '@/components/ui/table'
+import { Input } from '@/components/ui/input'
+import { CategorySelect } from '@/components/category-select'
+import { CategoryFilterDropdown } from '@/components/category-filter-dropdown'
+
+const PAGE_SIZE = 50
+
+interface ImportReviewTableProps {
+ transactions: ImportReviewTransaction[]
+ categories: Category[]
+ groups: CategoryGroup[]
+ userCurrency: string
+ locale: string
+ searchQuery: string
+ filterCategoryIds: string[]
+ filterUncategorized: boolean
+ statusFilter: 'all' | 'included' | 'excluded'
+ currentPage: number
+ onToggleExcluded: (id: string) => void
+ onChangeCategory: (id: string, categoryId: string | null) => void
+ onSearchChange: (query: string) => void
+ onCategoryIdsChange: (ids: string[]) => void
+ onUncategorizedChange: (value: boolean) => void
+ onStatusFilterChange: (filter: 'all' | 'included' | 'excluded') => void
+ onPageChange: (page: number) => void
+}
+
+export function ImportReviewTable({
+ transactions,
+ categories,
+ groups,
+ userCurrency,
+ locale,
+ searchQuery,
+ filterCategoryIds,
+ filterUncategorized,
+ statusFilter,
+ currentPage,
+ onToggleExcluded,
+ onChangeCategory,
+ onSearchChange,
+ onCategoryIdsChange,
+ onUncategorizedChange,
+ onStatusFilterChange,
+ onPageChange,
+}: ImportReviewTableProps) {
+ const { t } = useTranslation()
+
+ const hasCategoryFilter = filterCategoryIds.length > 0 || filterUncategorized
+
+ const filtered = useMemo(() => {
+ return transactions.filter(tx => {
+ if (searchQuery) {
+ const q = searchQuery.toLowerCase()
+ if (!tx.description.toLowerCase().includes(q)) return false
+ }
+ if (hasCategoryFilter) {
+ const catId = tx.selected_category_id !== undefined ? tx.selected_category_id : tx.suggested_category_id
+ if (filterUncategorized && !filterCategoryIds.length) {
+ if (catId) return false
+ } else if (filterUncategorized) {
+ if (catId && !filterCategoryIds.includes(catId)) return false
+ } else {
+ if (!catId || !filterCategoryIds.includes(catId)) return false
+ }
+ }
+ if (statusFilter === 'included' && tx.excluded) return false
+ if (statusFilter === 'excluded' && !tx.excluded) return false
+ return true
+ })
+ }, [transactions, searchQuery, filterCategoryIds, filterUncategorized, hasCategoryFilter, statusFilter])
+
+ const totalPages = Math.max(1, Math.ceil(filtered.length / PAGE_SIZE))
+ const safePage = Math.min(currentPage, totalPages)
+ const pageItems = filtered.slice((safePage - 1) * PAGE_SIZE, safePage * PAGE_SIZE)
+
+ return (
+ <div>
+ {/* Filter bar */}
+ <div className="px-5 py-3 border-b border-border bg-muted/30 flex flex-wrap items-center gap-3">
+ <Input
+ placeholder={t('import.searchTransactions')}
+ value={searchQuery}
+ onChange={(e) => { onSearchChange(e.target.value); onPageChange(1) }}
+ className="max-w-xs h-8 text-sm border border-border rounded-md px-3 bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
+ />
+ <CategoryFilterDropdown
+ categoryIds={filterCategoryIds}
+ onCategoryIdsChange={(ids) => { onCategoryIdsChange(ids); onPageChange(1) }}
+ filterUncategorized={filterUncategorized}
+ onUncategorizedChange={(v) => { onUncategorizedChange(v); onPageChange(1) }}
+ categories={categories}
+ groups={groups}
+ label={t('import.filterCategory')}
+ />
+ <select
+ className="border border-border rounded-md px-3 py-1.5 text-sm bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
+ value={statusFilter}
+ onChange={(e) => { onStatusFilterChange(e.target.value as 'all' | 'included' | 'excluded'); onPageChange(1) }}
+ >
+ <option value="all">{t('import.allStatus')}</option>
+ <option value="included">{t('import.included')}</option>
+ <option value="excluded">{t('import.excluded')}</option>
+ </select>
+ </div>
+
+ {/* Table */}
+ <div className="max-h-[480px] overflow-auto">
+ <Table>
+ <TableHeader>
+ <TableRow className="hover:bg-transparent bg-transparent border-b border-border">
+ <TableHead className="text-xs font-medium text-muted-foreground py-3 pl-4 w-[40px]">
+ <span className="sr-only">Toggle</span>
+ </TableHead>
+ <TableHead className="text-xs font-medium text-muted-foreground py-3 w-[100px]">
+ {t('transactions.date')}
+ </TableHead>
+ <TableHead className="text-xs font-medium text-muted-foreground py-3">
+ {t('transactions.description')}
+ </TableHead>
+ <TableHead className="text-xs font-medium text-muted-foreground py-3 text-right w-[120px]">
+ {t('transactions.amount')}
+ </TableHead>
+ <TableHead className="text-xs font-medium text-muted-foreground py-3 w-[160px]">
+ {t('import.category')}
+ </TableHead>
+ <TableHead className="text-xs font-medium text-muted-foreground py-3 pr-4 w-[90px]">
+ {t('transactions.status')}
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {pageItems.map((tx) => {
+ return (
+ <TableRow
+ key={tx._id}
+ className={`border-b border-border last:border-0 hover:bg-muted ${tx.excluded ? 'opacity-50' : ''}`}
+ >
+ <TableCell className="py-2.5 pl-4">
+ <input
+ type="checkbox"
+ checked={!tx.excluded}
+ onChange={() => onToggleExcluded(tx._id)}
+ className="rounded border-border text-primary focus:ring-primary"
+ />
+ </TableCell>
+ <TableCell className="py-2.5 text-xs text-muted-foreground whitespace-nowrap">
+ {new Date(tx.date).toLocaleDateString(locale)}
+ </TableCell>
+ <TableCell className={`py-2.5 text-sm ${tx.excluded ? 'line-through text-muted-foreground' : 'text-foreground'}`}>
+ {tx.description}
+ </TableCell>
+ <TableCell className={`py-2.5 text-right text-sm font-bold tabular-nums ${tx.type === 'credit' ? 'text-emerald-600' : 'text-rose-500'}`}>
+ {tx.type === 'credit' ? '+' : '−'}{formatCurrency(Math.abs(Number(tx.amount)), userCurrency, locale)}
+ </TableCell>
+ <TableCell className="py-2.5">
+ <CategorySelect
+ value={tx.selected_category_id !== undefined
+ ? (tx.selected_category_id ?? '')
+ : (tx.suggested_category_id ?? '')}
+ onChange={(v) => onChangeCategory(tx._id, v || null)}
+ categories={categories}
+ groups={groups}
+ placeholder={t('import.noCategory')}
+ allowNone
+ className="w-full border border-border rounded-md px-2 py-1 text-xs bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
+ />
+ </TableCell>
+ <TableCell className="py-2.5 pr-4">
+ {tx.excluded ? (
+ <span className="text-xs bg-muted text-muted-foreground px-2 py-0.5 rounded">
+ {t('import.excluded')}
+ </span>
+ ) : (
+ <span className="text-xs bg-emerald-50 text-emerald-700 px-2 py-0.5 rounded">
+ {t('import.included')}
+ </span>
+ )}
+ </TableCell>
+ </TableRow>
+ )
+ })}
+ </TableBody>
+ </Table>
+ </div>
+
+ {/* Pagination */}
+ {totalPages > 1 && (
+ <div className="px-5 py-3 border-t border-border flex items-center justify-between text-sm">
+ <button
+ className="text-muted-foreground hover:text-foreground disabled:opacity-30"
+ disabled={safePage <= 1}
+ onClick={() => onPageChange(safePage - 1)}
+ >
+ ← {t('common.previous', 'Previous')}
+ </button>
+ <span className="text-xs text-muted-foreground">
+ {t('import.page', { current: safePage, total: totalPages })}
+ </span>
+ <button
+ className="text-muted-foreground hover:text-foreground disabled:opacity-30"
+ disabled={safePage >= totalPages}
+ onClick={() => onPageChange(safePage + 1)}
+ >
+ {t('common.next', 'Next')} →
+ </button>
+ </div>
+ )}
+ </div>
+ )
+}
diff --git a/frontend/src/components/import-summary-bar.tsx b/frontend/src/components/import-summary-bar.tsx
new file mode 100644
index 00000000..dbc61661
--- /dev/null
+++ b/frontend/src/components/import-summary-bar.tsx
@@ -0,0 +1,43 @@
+import { useTranslation } from 'react-i18next'
+import type { ImportReviewTransaction } from '@/types'
+import { formatCurrency } from '@/lib/format'
+
+interface ImportSummaryBarProps {
+ transactions: ImportReviewTransaction[]
+ userCurrency: string
+ locale: string
+}
+
+export function ImportSummaryBar({ transactions, userCurrency, locale }: ImportSummaryBarProps) {
+ const { t } = useTranslation()
+
+ const total = transactions.length
+ const included = transactions.filter(t => !t.excluded).length
+ const excluded = total - included
+
+ const balanceImpact = transactions
+ .filter(t => !t.excluded)
+ .reduce((sum, t) => sum + (t.type === 'credit' ? Number(t.amount) : -Number(t.amount)), 0)
+
+ return (
+ <div className="sticky top-0 z-10 bg-card border border-border px-5 py-3 flex flex-wrap items-center gap-x-4 gap-y-1 text-sm">
+ <span className="text-muted-foreground">
+ {total} {t('import.transactionsFound')}
+ </span>
+ <span className="text-foreground font-medium">
+ {included} {t('import.willBeImported')}
+ </span>
+ {excluded > 0 && (
+ <span className="text-muted-foreground line-through">
+ {excluded} {t('import.excluded').toLowerCase()}
+ </span>
+ )}
+ <span className="ml-auto text-xs text-muted-foreground">
+ {t('import.balanceImpact')}: {' '}
+ <span className={balanceImpact >= 0 ? 'text-emerald-600 font-medium' : 'text-rose-500 font-medium'}>
+ {formatCurrency(balanceImpact, userCurrency, locale)}
+ </span>
+ </span>
+ </div>
+ )
+}
diff --git a/frontend/src/components/transactions-filter-bar.tsx b/frontend/src/components/transactions-filter-bar.tsx
index 8b7f218d..79509d6f 100644
--- a/frontend/src/components/transactions-filter-bar.tsx
+++ b/frontend/src/components/transactions-filter-bar.tsx
@@ -16,7 +16,6 @@ import {
X,
} from 'lucide-react'
import { ptBR, enUS } from 'date-fns/locale'
-
import {
DropdownMenu,
DropdownMenuCheckboxItem,
@@ -39,6 +38,7 @@ import {
import { Calendar } from '@/components/ui/calendar'
import { Button } from '@/components/ui/button'
import { cn } from '@/lib/utils'
+import { CategoryFilterContent } from '@/components/category-filter-content'
import type { Account, Category, CategoryGroup, Group, Payee } from '@/types'
interface TransactionsFilterBarProps {
@@ -155,20 +155,6 @@ export function TransactionsFilterBar({
return map
}, [categories])
- const displayCategoryGroups = useMemo(() => {
- const ungroupedCategories = categories.filter((c) => !c.group_id)
- if (ungroupedCategories.length === 0) return categoryGroups
-
- return [
- ...categoryGroups,
- {
- id: 'ungrouped',
- name: t('groups.noGroup'),
- categories: ungroupedCategories,
- } as CategoryGroup,
- ]
- }, [categories, categoryGroups, t])
-
const selectedPayee = useMemo(
() => payees.find((p) => p.id === filterPayee),
[payees, filterPayee],
@@ -425,74 +411,15 @@ export function TransactionsFilterBar({
sideOffset={8}
className="max-h-[320px] w-[240px] overflow-y-auto p-1"
>
- <DropdownMenuCheckboxItem
- checked={filterUncategorized}
- onSelect={(e) => {
- e.preventDefault()
- keepCategorySubOpenRef.current = true
- onUncategorizedChange(!filterUncategorized)
- }}
- className="gap-2 rounded-sm py-1.5 text-[13px]"
- >
- <span className="min-w-0 flex-1 truncate text-left italic text-muted-foreground">
- {t('transactions.uncategorized')}
- </span>
- </DropdownMenuCheckboxItem>
- <div className="my-1 h-px bg-border/60" />
- {displayCategoryGroups.length === 0 ? (
- <div className="px-2 py-3 text-center text-[12px] text-muted-foreground">
- {t('transactions.filtersBar.noOptions')}
- </div>
- ) : (
- displayCategoryGroups.map((group) => (
- <DropdownMenuGroup key={group.id}>
- <DropdownMenuLabel className="px-2 py-1 text-[10.5px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/70">
- {group.name}
- </DropdownMenuLabel>
- {group.categories.map((c) => (
- <DropdownMenuCheckboxItem
- key={c.id}
- checked={filterCategoryIds.includes(c.id)}
- onSelect={(e) => {
- e.preventDefault()
- keepCategorySubOpenRef.current = true
- onCategoryIdsChange(
- toggleInArray(filterCategoryIds, c.id),
- )
- }}
- className="gap-2 rounded-sm py-1.5 text-[13px]"
- >
- {c.color ? (
- <span
- className="size-2.5 shrink-0 rounded-full border border-black/5"
- style={{ backgroundColor: c.color }}
- />
- ) : null}
- <span className="min-w-0 flex-1 truncate text-left">
- {c.name}
- </span>
- </DropdownMenuCheckboxItem>
- ))}
- </DropdownMenuGroup>
- ))
- )}
- {(filterCategoryIds.length > 0 || filterUncategorized) && (
- <>
- <div className="my-1 h-px bg-border/60" />
- <DropdownMenuItem
- onSelect={(e) => {
- e.preventDefault()
- keepCategorySubOpenRef.current = true
- onCategoryIdsChange([])
- onUncategorizedChange(false)
- }}
- className="gap-2 rounded-sm px-2 py-1.5 text-[12px] text-muted-foreground"
- >
- <X size={12} />
- {t('transactions.filtersBar.clearSelection')}
- </DropdownMenuItem>
- </>
- )}
+ <CategoryFilterContent
+ categoryIds={filterCategoryIds}
+ onCategoryIdsChange={onCategoryIdsChange}
+ filterUncategorized={filterUncategorized}
+ onUncategorizedChange={onUncategorizedChange}
+ categories={categories}
+ groups={categoryGroups}
+ onKeepOpen={() => { keepCategorySubOpenRef.current = true }}
+ />
</DropdownMenuSubContent>
</DropdownMenuPortal>
</DropdownMenuSub>
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 247a9273..c78fc9d2 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -20,6 +20,7 @@ import type {
BudgetVsActual,
Rule,
ImportLog,
+ ImportPreviewTransaction,
Asset,
AssetGroup,
AssetValue,
@@ -366,7 +367,7 @@ export const transactions = {
flip_amount?: boolean
inflow_column?: string
outflow_column?: string
- }): Promise<{ transactions: Transaction[]; detected_format: string }> => {
+ }): Promise<{ transactions: ImportPreviewTransaction[]; detected_format: string }> => {
const formData = new FormData()
formData.append('file', file)
if (options?.date_format) formData.append('date_format', options.date_format)
@@ -378,14 +379,14 @@ export const transactions = {
},
import: async (
account_id: string,
- transactions: Transaction[],
+ transactions: ImportPreviewTransaction[],
filename: string,
detected_format: string,
options?: { detect_duplicates?: boolean },
- ): Promise<{ imported: number; skipped: number; import_log_id: string }> => {
+ ): Promise<{ imported: number; skipped: number; excluded: number; import_log_id: string }> => {
const payload: {
account_id: string
- transactions: Transaction[]
+ transactions: ImportPreviewTransaction[]
filename: string
detected_format: string
detect_duplicates?: boolean
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4f1174dd..fb46fd37 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -165,6 +165,7 @@
"section": "Financial",
"description": "Description",
"amount": "Amount",
+ "status": "Status",
"date": "Date",
"category": "Category",
"account": "Account",
@@ -670,7 +671,22 @@
"deleteAll": "Delete all",
"processError": "Error processing file",
"importError": "Error importing transactions",
- "previewInfo": "{{count}} transactions · format {{format}}"
+ "previewInfo": "{{count}} transactions · format {{format}}",
+ "excluded": "Excluded",
+ "included": "Included",
+ "searchTransactions": "Search transactions...",
+ "filterCategory": "Filter by category",
+ "filterStatus": "Filter by status",
+ "allStatus": "All",
+ "willBeImported": "will be imported",
+ "transactionsFound": "transactions found",
+ "category": "Category",
+ "noCategory": "Uncategorized",
+ "selectCategory": "Select category...",
+ "balanceImpact": "Balance impact",
+ "importedWithExcluded": "{{imported}} imported, {{skipped}} skipped, {{excluded}} excluded",
+ "suggested": "Suggested",
+ "page": "Page {{current}} of {{total}}"
},
"assets": {
"title": "Assets",
diff --git a/frontend/src/locales/pt-BR.json b/frontend/src/locales/pt-BR.json
index 4e264654..80b9f647 100644
--- a/frontend/src/locales/pt-BR.json
+++ b/frontend/src/locales/pt-BR.json
@@ -165,6 +165,7 @@
"section": "Financeiro",
"description": "Descrição",
"amount": "Valor",
+ "status": "Status",
"date": "Data",
"category": "Categoria",
"account": "Conta",
@@ -670,7 +671,22 @@
"deleteAll": "Excluir tudo",
"processError": "Erro ao processar arquivo",
"importError": "Erro ao importar transações",
- "previewInfo": "{{count}} transações · formato {{format}}"
+ "previewInfo": "{{count}} transações · formato {{format}}",
+ "excluded": "Excluída",
+ "included": "Incluída",
+ "searchTransactions": "Buscar transações...",
+ "filterCategory": "Filtrar por categoria",
+ "filterStatus": "Filtrar por status",
+ "allStatus": "Todas",
+ "willBeImported": "serão importadas",
+ "transactionsFound": "transações encontradas",
+ "category": "Categoria",
+ "noCategory": "Sem categoria",
+ "selectCategory": "Selecionar categoria...",
+ "balanceImpact": "Impacto no saldo",
+ "importedWithExcluded": "{{imported}} importadas, {{skipped}} ignoradas, {{excluded}} excluídas",
+ "suggested": "Sugerida",
+ "page": "Página {{current}} de {{total}}"
},
"assets": {
"title": "Patrimônio",
diff --git a/frontend/src/pages/import.tsx b/frontend/src/pages/import.tsx
index 6d02dee6..aa0406d9 100644
--- a/frontend/src/pages/import.tsx
+++ b/frontend/src/pages/import.tsx
@@ -2,29 +2,20 @@ import { useState, useRef, useCallback } from 'react'
import { getAccountName } from '@/lib/account-utils'
import { useTranslation } from 'react-i18next'
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
-import { transactions as transactionsApi, accounts as accountsApi, importLogs as importLogsApi } from '@/lib/api'
+import { transactions as transactionsApi, accounts as accountsApi, importLogs as importLogsApi, categories as categoriesApi, categoryGroups as categoryGroupsApi } from '@/lib/api'
import { invalidateFinancialQueries } from '@/lib/invalidate-queries'
+import { formatCurrency } from '@/lib/format'
import { toast } from 'sonner'
import { Button } from '@/components/ui/button'
import { Label } from '@/components/ui/label'
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/table'
-import type { Transaction, ImportLog } from '@/types'
+import type { ImportPreviewTransaction, ImportReviewTransaction, ImportLog } from '@/types'
import { Upload, FileText, X, CheckCircle2, AlertCircle, History, Trash2, Settings2, Download } from 'lucide-react'
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog'
import { PageHeader } from '@/components/page-header'
+import { ImportSummaryBar } from '@/components/import-summary-bar'
+import { ImportReviewTable } from '@/components/import-review-table'
import { useAuth } from '@/contexts/auth-context'
-function formatCurrency(value: number, currency = 'USD', locale = 'en-US') {
- return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)
-}
-
const TYPE_LABELS: Record<string, string> = {
checking: 'accounts.typeChecking',
savings: 'accounts.typeSavings',
@@ -32,6 +23,15 @@ const TYPE_LABELS: Record<string, string> = {
investment: 'accounts.typeInvestment',
}
+function toReviewTransactions(txns: ImportPreviewTransaction[]): ImportReviewTransaction[] {
+ return txns.map((tx, i) => ({
+ ...tx,
+ _id: tx.external_id ? `${tx.external_id}-${i}` : `idx-${i}`,
+ excluded: false,
+ selected_category_id: undefined,
+ }))
+}
+
export default function ImportPage() {
const { t, i18n } = useTranslation()
const { user } = useAuth()
@@ -39,7 +39,8 @@ export default function ImportPage() {
const locale = i18n.language === 'en' ? 'en-US' : i18n.language
const queryClient = useQueryClient()
const fileInputRef = useRef<HTMLInputElement>(null)
- const [previewData, setPreviewData] = useState<{ transactions: Transaction[]; detected_format: string } | null>(null)
+ const [previewData, setPreviewData] = useState<{ transactions: ImportPreviewTransaction[]; detected_format: string } | null>(null)
+ const [reviewTransactions, setReviewTransactions] = useState<ImportReviewTransaction[]>([])
const [selectedAccount, setSelectedAccount] = useState('')
const [dragOver, setDragOver] = useState(false)
const [fileName, setFileName] = useState<string | null>(null)
@@ -47,7 +48,12 @@ export default function ImportPage() {
const [deleteTarget, setDeleteTarget] = useState<ImportLog | null>(null)
const [csvHeaders, setCsvHeaders] = useState<string[]>([])
- // CSV options
+ const [searchQuery, setSearchQuery] = useState('')
+ const [filterCategoryIds, setFilterCategoryIds] = useState<string[]>([])
+ const [filterUncategorized, setFilterUncategorized] = useState(false)
+ const [statusFilter, setStatusFilter] = useState<'all' | 'included' | 'excluded'>('all')
+ const [currentPage, setCurrentPage] = useState(1)
+
const [csvDateFormat, setCsvDateFormat] = useState('')
const [csvFlipAmount, setCsvFlipAmount] = useState(false)
const [csvDetectDuplicates, setCsvDetectDuplicates] = useState(true)
@@ -60,6 +66,16 @@ export default function ImportPage() {
queryFn: () => accountsApi.list(),
})
+ const { data: categoriesList = [] } = useQuery({
+ queryKey: ['categories'],
+ queryFn: categoriesApi.list,
+ })
+
+ const { data: categoryGroupsList = [] } = useQuery({
+ queryKey: ['category-groups'],
+ queryFn: categoryGroupsApi.list,
+ })
+
const { data: importHistory = [] } = useQuery({
queryKey: ['import-logs'],
queryFn: importLogsApi.list,
@@ -68,7 +84,15 @@ export default function ImportPage() {
const previewMutation = useMutation({
mutationFn: ({ file, options }: { file: File; options?: { date_format?: string; flip_amount?: boolean; inflow_column?: string; outflow_column?: string } }) =>
transactionsApi.previewImport(file, options),
- onSuccess: (data) => setPreviewData(data),
+ onSuccess: (data) => {
+ setPreviewData(data)
+ setReviewTransactions(toReviewTransactions(data.transactions))
+ setSearchQuery('')
+ setFilterCategoryIds([])
+ setFilterUncategorized(false)
+ setStatusFilter('all')
+ setCurrentPage(1)
+ },
onError: (error: unknown) => {
const detail = (error as { response?: { data?: { detail?: string } } })?.response?.data?.detail
toast.error(detail || t('import.processError'))
@@ -76,21 +100,41 @@ export default function ImportPage() {
})
const importMutation = useMutation({
- mutationFn: () => transactionsApi.import(
- selectedAccount,
- previewData!.transactions,
- fileName ?? '',
- previewData!.detected_format,
- isCsvFile ? { detect_duplicates: csvDetectDuplicates } : undefined,
- ),
+ mutationFn: () => {
+ const txns = reviewTransactions.map(rt => ({
+ description: rt.description,
+ amount: rt.amount,
+ date: rt.date,
+ type: rt.type,
+ external_id: rt.external_id ?? undefined,
+ currency: rt.currency ?? undefined,
+ fx_rate: rt.fx_rate ?? undefined,
+ payee_raw: rt.payee_raw ?? undefined,
+ category_name: rt.category_name ?? undefined,
+ excluded: rt.excluded,
+ category_id: rt.selected_category_id !== undefined
+ ? (rt.selected_category_id ?? undefined)
+ : (rt.suggested_category_id ?? undefined),
+ force_uncategorized: rt.selected_category_id === null,
+ }))
+ return transactionsApi.import(
+ selectedAccount,
+ txns,
+ fileName ?? '',
+ previewData!.detected_format,
+ isCsvFile ? { detect_duplicates: csvDetectDuplicates } : undefined,
+ )
+ },
onSuccess: (data) => {
invalidateFinancialQueries(queryClient)
queryClient.invalidateQueries({ queryKey: ['import-logs'] })
- const msg = data.skipped > 0
- ? t('import.importedWithSkipped', { imported: data.imported, skipped: data.skipped })
+ const hasSkippedOrExcluded = (data.skipped ?? 0) > 0 || (data.excluded ?? 0) > 0
+ const msg = hasSkippedOrExcluded
+ ? t('import.importedWithExcluded', { imported: data.imported, skipped: data.skipped ?? 0, excluded: data.excluded ?? 0 })
: `${data.imported} ${t('import.transactionsImported')}`
toast.success(msg)
setPreviewData(null)
+ setReviewTransactions([])
setSelectedAccount('')
setFileName(null)
setCurrentFile(null)
@@ -153,6 +197,7 @@ export default function ImportPage() {
options.outflow_column = csvOutflowColumn
}
previewMutation.mutate({ file: currentFile, options })
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentFile, csvDateFormat, csvFlipAmount, csvSplitColumns, csvInflowColumn, csvOutflowColumn])
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -169,6 +214,7 @@ export default function ImportPage() {
const handleReset = () => {
setPreviewData(null)
+ setReviewTransactions([])
setFileName(null)
setCurrentFile(null)
setSelectedAccount('')
@@ -176,14 +222,27 @@ export default function ImportPage() {
if (fileInputRef.current) fileInputRef.current.value = ''
}
+ const handleToggleExcluded = useCallback((id: string) => {
+ setReviewTransactions(prev => prev.map(t =>
+ t._id === id ? { ...t, excluded: !t.excluded } : t
+ ))
+ }, [])
+
+ const handleChangeCategory = useCallback((id: string, categoryId: string | null) => {
+ setReviewTransactions(prev => prev.map(t =>
+ t._id === id ? { ...t, selected_category_id: categoryId } : t
+ ))
+ }, [])
+
const isCsvFile = fileName?.toLowerCase().endsWith('.csv') ?? false
const incomeCount = previewData?.transactions.filter(t => t.type === 'credit').length ?? 0
const expenseCount = previewData?.transactions.filter(t => t.type === 'debit').length ?? 0
+ const includedCount = reviewTransactions.filter(t => !t.excluded).length
+
return (
<div className="space-y-6">
- {/* Page header */}
<PageHeader section={t('import.title')} title={t('import.subtitle')} />
{/* Upload zone */}
@@ -260,9 +319,9 @@ export default function ImportPage() {
</div>
</div>
- {/* Preview section */}
+ {/* Review section */}
{previewData && (
- <div className="bg-card rounded-xl border border-border shadow-sm">
+ <div className="bg-card rounded-xl border border-border shadow-sm overflow-hidden">
{/* Header */}
<div className="px-5 py-4 border-b border-border">
<div className="flex items-center justify-between">
@@ -287,7 +346,7 @@ export default function ImportPage() {
{t('import.importTo')}
</Label>
<select
- className="flex-1 border border-border rounded-lg px-3 py-2 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
+ className="flex-1 border border-border rounded-md px-3 py-2 text-sm bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
value={selectedAccount}
onChange={(e) => setSelectedAccount(e.target.value)}
>
@@ -313,7 +372,6 @@ export default function ImportPage() {
<p className="text-xs font-medium text-muted-foreground">{t('import.csvOptions')}</p>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
- {/* Date format */}
<div>
<Label className="text-xs text-muted-foreground mb-1 block">{t('import.dateFormat')}</Label>
<select
@@ -327,8 +385,6 @@ export default function ImportPage() {
<option value="YYYY-MM-DD">YYYY-MM-DD</option>
</select>
</div>
-
- {/* Flip amounts */}
<div className="flex items-center gap-2 pt-4">
<input
type="checkbox"
@@ -341,8 +397,6 @@ export default function ImportPage() {
{t('import.flipAmounts')}
</Label>
</div>
-
- {/* Split columns toggle */}
<div className="flex items-center gap-2 pt-4">
<input
type="checkbox"
@@ -355,8 +409,6 @@ export default function ImportPage() {
{t('import.splitColumns')}
</Label>
</div>
-
- {/* Duplicate detection toggle */}
<div className="flex items-center gap-2 pt-4">
<input
type="checkbox"
@@ -371,13 +423,12 @@ export default function ImportPage() {
</div>
</div>
- {/* Split column selectors */}
{csvSplitColumns && csvHeaders.length > 0 && (
- <div className="grid grid-cols-2 gap-4 mt-3">
+ <div className="grid grid-cols-2 gap-4 my-3">
<div>
<Label className="text-xs text-muted-foreground mb-1 block">{t('import.inflowColumn')}</Label>
<select
- className="w-full border border-border rounded-lg px-3 py-1.5 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
+ className="w-full border border-border rounded-md px-3 py-1.5 text-sm bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
value={csvInflowColumn}
onChange={(e) => { setCsvInflowColumn(e.target.value); setTimeout(rePreview, 0) }}
>
@@ -388,7 +439,7 @@ export default function ImportPage() {
<div>
<Label className="text-xs text-muted-foreground mb-1 block">{t('import.outflowColumn')}</Label>
<select
- className="w-full border border-border rounded-lg px-3 py-1.5 text-sm bg-card text-foreground focus:outline-none focus:ring-2 focus:ring-primary"
+ className="w-full border border-border rounded-md px-3 py-1.5 text-sm bg-background focus:outline-none focus-visible:ring-ring/30 focus-visible:ring-[2px]"
value={csvOutflowColumn}
onChange={(e) => { setCsvOutflowColumn(e.target.value); setTimeout(rePreview, 0) }}
>
@@ -401,42 +452,33 @@ export default function ImportPage() {
</div>
)}
- {/* Table */}
- <div className="max-h-96 overflow-auto">
- <Table>
- <TableHeader>
- <TableRow className="hover:bg-transparent bg-transparent border-b border-border">
- <TableHead className="text-xs font-medium text-muted-foreground py-3 pl-5 w-[110px]">
- {t('transactions.date')}
- </TableHead>
- <TableHead className="text-xs font-medium text-muted-foreground py-3">
- {t('transactions.description')}
- </TableHead>
- <TableHead className="text-xs font-medium text-muted-foreground py-3 pr-5 text-right w-[160px]">
- {t('transactions.amount')}
- </TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {previewData.transactions.slice(0, 50).map((tx, i) => (
- <TableRow key={i} className="border-b border-border last:border-0 hover:bg-muted">
- <TableCell className="py-3 pl-5 text-xs text-muted-foreground whitespace-nowrap">
- {new Date(tx.date).toLocaleDateString(locale)}
- </TableCell>
- <TableCell className="py-3 text-sm text-foreground">{tx.description}</TableCell>
- <TableCell className={`py-3 pr-5 text-right text-sm font-bold tabular-nums ${tx.type === 'credit' ? 'text-emerald-600' : 'text-rose-500'}`}>
- {tx.type === 'credit' ? '+' : '−'}{formatCurrency(Math.abs(Number(tx.amount)), userCurrency, locale)}
- </TableCell>
- </TableRow>
- ))}
- </TableBody>
- </Table>
- {previewData.transactions.length > 50 && (
- <p className="text-xs text-muted-foreground text-center py-3 border-t border-border">
- {t('import.showingPreview', { shown: 50, total: previewData.transactions.length })}
- </p>
- )}
- </div>
+ {/* Summary bar */}
+ <ImportSummaryBar
+ transactions={reviewTransactions}
+ userCurrency={userCurrency}
+ locale={locale}
+ />
+
+ {/* Review table */}
+ <ImportReviewTable
+ transactions={reviewTransactions}
+ categories={categoriesList}
+ groups={categoryGroupsList}
+ userCurrency={userCurrency}
+ locale={locale}
+ searchQuery={searchQuery}
+ filterCategoryIds={filterCategoryIds}
+ filterUncategorized={filterUncategorized}
+ statusFilter={statusFilter}
+ currentPage={currentPage}
+ onToggleExcluded={handleToggleExcluded}
+ onChangeCategory={handleChangeCategory}
+ onSearchChange={setSearchQuery}
+ onCategoryIdsChange={setFilterCategoryIds}
+ onUncategorizedChange={setFilterUncategorized}
+ onStatusFilterChange={setStatusFilter}
+ onPageChange={setCurrentPage}
+ />
{/* Footer actions */}
<div className="px-4 sm:px-5 py-4 border-t border-border flex items-center justify-between">
@@ -454,7 +496,7 @@ export default function ImportPage() {
<Upload size={14} />
{importMutation.isPending
? t('common.loading')
- : t('import.importButton', { count: previewData.transactions.length })}
+ : t('import.importButton', { count: includedCount })}
</Button>
</div>
</div>
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index dd5c8447..db696d7c 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -305,6 +305,29 @@ export interface ImportLog {
created_at: string
}
+export interface ImportPreviewTransaction {
+ description: string
+ amount: number
+ date: string
+ type: 'debit' | 'credit'
+ external_id?: string | null
+ currency?: string | null
+ fx_rate?: number | null
+ payee_raw?: string | null
+ category_name?: string | null
+ suggested_category_id?: string | null
+ suggested_category_name?: string | null
+ excluded?: boolean
+ category_id?: string | null
+ force_uncategorized?: boolean
+}
+
+export interface ImportReviewTransaction extends ImportPreviewTransaction {
+ _id: string
+ excluded: boolean
+ selected_category_id?: string | null
+}
+
export interface RecurringTransaction {
id: string
user_id: string