Display currency symbol in column header, do not put currency symbols in amounts, support non-USD YNAB plans (#24)

This also adjusts some column display widths for better (subjective)
readability (eventually these can be made configurable via config.yaml).

---------

Co-authored-by: Claude <[email protected]>

Author: wesm

moneyflow/app_controller.py

@@ -136,12 +136,16 @@ def _get_display_labels(self) -> dict:
     def _get_column_config(self) -> dict:
         """Get column configuration from backend, with safe fallback to defaults."""
         try:
-            return self.data_manager.mm.get_column_config()
+            config = self.data_manager.mm.get_column_config()
+            # Add currency symbol to config
+            config["currency_symbol"] = self.data_manager.mm.get_currency_symbol()
+            return config
         except (AttributeError, Exception):
             # Fallback to default widths if backend doesn't support it
             return {
-                "merchant_width_pct": 25,
-                "account_width_pct": 30,
+                "merchant_width_pct": 40,
+                "account_width_pct": 40,
+                "currency_symbol": "$",
             }
 
     def refresh_view(self, force_rebuild: bool = True) -> None:

moneyflow/backend_config.py

@@ -19,6 +19,9 @@ class BackendConfig:
     # Field display names
     merchant_field_name: str = "Merchant"  # Can be "Item" for Amazon
 
+    # Currency symbol (displayed in column headers)
+    currency_symbol: str = "$"  # Default to USD
+
     # Available grouping modes (in order for cycling with 'g' key)
     grouping_modes: list[str] = field(
         default_factory=lambda: ["merchant", "category", "group", "account"]

moneyflow/backends/amazon.py

@@ -154,13 +154,10 @@ def get_column_config(self) -> Dict[str, Any]:
 
         Returns:
             Dictionary with column width percentages:
-            - merchant_width_pct: 33 (30% wider than default 25)
-            - account_width_pct: 30 (wider for Order IDs)
+            - merchant_width_pct: 60 (wider for Item Names)
+            - account_width_pct: 30 (Order IDs are small)
         """
-        return {
-            "merchant_width_pct": 33,  # 30% wider than default (25 * 1.3 ≈ 33)
-            "account_width_pct": 30,  # Wider for Order IDs
-        }
+        return {"merchant_width_pct": 60, "account_width_pct": 30}
 
     async def login(
         self,

moneyflow/backends/base.py

@@ -210,13 +210,29 @@ def get_column_config(self) -> Dict[str, Any]:
 
         Example:
             >>> backend.get_column_config()
-            {'merchant_width_pct': 25, 'account_width_pct': 30}
+            {'merchant_width_pct': 40, 'account_width_pct': 40}
         """
         return {
-            "merchant_width_pct": 25,  # Default 25% width
-            "account_width_pct": 30,  # Default 30% width (wider for long account names)
+            "merchant_width_pct": 40,  # Default 40% width
+            "account_width_pct": 40,  # Default 40% width
         }
 
+    def get_currency_symbol(self) -> str:
+        """
+        Get the currency symbol for this backend.
+
+        Returns currency symbol to display in column headers (e.g., "$", "€", "£").
+        Defaults to "$" (USD). Backends can override to fetch from API if available.
+
+        Returns:
+            Currency symbol as string (e.g., "$", "€", "£")
+
+        Example:
+            >>> backend.get_currency_symbol()
+            '$'
+        """
+        return "$"  # Default to USD
+
     def delete_session(self) -> None:
         """
         Delete saved session data.

moneyflow/backends/ynab.py

@@ -21,6 +21,7 @@ class YNABBackend(FinanceBackend):
     def __init__(self):
         """Initialize the YNAB backend."""
         self.client = YNABClient()
+        self._currency_symbol: Optional[str] = None
 
     async def login(
         self,
@@ -152,6 +153,15 @@ async def get_all_merchants(self) -> List[str]:
         """
         return self.client.get_all_merchants()
 
+    def get_currency_symbol(self) -> str:
+        """
+        Get the currency symbol from YNAB budget settings.
+
+        Returns:
+            Currency symbol (e.g., "$", "€", "£") from budget's currency_format
+        """
+        return self.client.currency_symbol
+
     def clear_auth(self) -> None:
         """
         Clear all authentication state and close the API client.

moneyflow/formatters.py

@@ -57,28 +57,30 @@ class ViewPresenter:
     @staticmethod
     def format_amount(amount: float, for_table: bool = False) -> Union[str, Text]:
         """
-        Format dollar amount with sign outside dollar sign.
+        Format amount with sign and thousands separators.
+
+        Currency symbol is shown in column header, not in cells, to reduce visual noise.
 
         Args:
-            amount: The dollar amount to format
+            amount: The amount to format
             for_table: If True, return Rich Text with right justification for tables
 
         Returns:
-            Formatted string like "-$1,234.56" or "+$5,000.00"
+            Formatted string like "-1,234.56" or "+5,000.00" (no currency symbol)
             If for_table=True, returns Rich Text object with right justification
             Positive amounts (credits) are styled in green
 
         Examples:
             >>> ViewPresenter.format_amount(-1234.56)
-            '-$1,234.56'
+            '-1,234.56'
             >>> ViewPresenter.format_amount(5000.00)
-            '+$5,000.00'
+            '+5,000.00'
             >>> ViewPresenter.format_amount(0.00)
-            '+$0.00'
+            '+0.00'
         """
         sign = "-" if amount < 0 else "+"
         abs_amount = abs(amount)
-        formatted = f"{sign}${abs_amount:,.2f}"
+        formatted = f"{sign}{abs_amount:,.2f}"
 
         if for_table:
             # Color positive amounts (credits) green for visual distinction
@@ -160,7 +162,7 @@ def prepare_aggregation_columns(
             group_by_field: The field to group by
             sort_by: Current sort mode
             sort_direction: Current sort direction
-            column_config: Optional backend-specific column width config
+            column_config: Backend-specific config (widths, currency_symbol)
             display_labels: Optional backend-specific display labels
 
         Returns:
@@ -177,7 +179,8 @@ def prepare_aggregation_columns(
         """
         # Use defaults if not provided
         if column_config is None:
-            column_config = {"merchant_width_pct": 35, "account_width_pct": 30}
+            column_config = {}
+
         if display_labels is None:
             display_labels = {"merchant": "Merchant", "account": "Account", "accounts": "Accounts"}
 
@@ -190,13 +193,17 @@ def prepare_aggregation_columns(
         }
         name_label = name_labels[group_by_field]
 
+        # Extract currency symbol from config (defaults to $ if not provided)
+        currency_symbol = column_config.get("currency_symbol", "$") if column_config else "$"
+
+        # Default name width
+        name_width = 40
+
         # Get column width based on field type
         if group_by_field == "merchant":
-            name_width = column_config.get("merchant_width_pct", 35)  # Wider for 150 char terminals
+            name_width = column_config.get("merchant_width_pct", name_width)
         elif group_by_field == "account":
-            name_width = column_config.get("account_width_pct", 30)
-        else:
-            name_width = 40  # Default for category/group
+            name_width = column_config.get("account_width_pct", name_width)
 
         # Map aggregation field to sort mode
         field_to_sort_mode: dict[AggregationField, SortMode] = {
@@ -214,8 +221,8 @@ def prepare_aggregation_columns(
         amount_arrow = ViewPresenter.get_sort_arrow(sort_by, sort_direction, SortMode.AMOUNT)
 
         # Build column specs
-        # Total column label - right-aligned to match the values
-        total_label = f"Total {amount_arrow}".strip()
+        # Total column label - right-aligned to match the values, includes currency
+        total_label = f"Total ({currency_symbol}) {amount_arrow}".strip()
         total_label_text = Text(total_label, justify="right")
 
         columns: list[ColumnSpec] = [
@@ -389,7 +396,7 @@ def prepare_transaction_columns(
         Args:
             sort_by: Current sort mode
             sort_direction: Current sort direction
-            column_config: Optional backend-specific column width config
+            column_config: Backend-specific config (widths, currency_symbol)
             display_labels: Optional backend-specific display labels
 
         Returns:
@@ -406,10 +413,17 @@ def prepare_transaction_columns(
         """
         # Use defaults if not provided
         if column_config is None:
-            column_config = {"merchant_width_pct": 25, "account_width_pct": 30}
+            column_config = {
+                "merchant_width_pct": 25,
+                "account_width_pct": 30,
+                "currency_symbol": "$",
+            }
         if display_labels is None:
             display_labels = {"merchant": "Merchant", "account": "Account", "accounts": "Accounts"}
 
+        # Extract currency symbol from config
+        currency_symbol = column_config.get("currency_symbol", "$")
+
         # Get arrows for each field
         date_arrow = ViewPresenter.get_sort_arrow(sort_by, sort_direction, SortMode.DATE)
         merchant_arrow = ViewPresenter.get_sort_arrow(sort_by, sort_direction, SortMode.MERCHANT)
@@ -425,8 +439,8 @@ def prepare_transaction_columns(
         merchant_width = column_config.get("merchant_width_pct", 25)
         account_width = column_config.get("account_width_pct", 30)
 
-        # Amount column label - right-aligned to match the values
-        amount_label = f"Amount {amount_arrow}".strip()
+        # Amount column label - right-aligned to match the values, includes currency
+        amount_label = f"Amount ({currency_symbol}) {amount_arrow}".strip()
         amount_label_text = Text(amount_label, justify="right")
 
         columns: list[ColumnSpec] = [

moneyflow/ynab_client.py

@@ -22,6 +22,7 @@ def __init__(self):
         self.api_client: Optional[ynab.ApiClient] = None
         self.access_token: Optional[str] = None
         self.budget_id: Optional[str] = None
+        self.currency_symbol: str = "$"  # Default to USD, updated during login
         self._transaction_cache: Optional[List[Dict[str, Any]]] = None
         self._cache_params: Optional[Dict[str, Any]] = None
 
@@ -49,7 +50,12 @@ def login(self, access_token: str) -> None:
             raise ValueError("No budgets found in YNAB account")
 
         if not self.budget_id:
-            self.budget_id = budgets_response.data.budgets[0].id
+            budget = budgets_response.data.budgets[0]
+            self.budget_id = budget.id
+
+            # Fetch currency symbol from budget settings
+            if budget.currency_format and budget.currency_format.currency_symbol:
+                self.currency_symbol = budget.currency_format.currency_symbol
 
     def get_transactions(
         self,

tests/conftest.py

@@ -6,11 +6,14 @@
 """
 
 from datetime import date
+from typing import Union
 
 import polars as pl
 import pytest
+from rich.text import Text
 
 from moneyflow.data_manager import DataManager
+from moneyflow.formatters import ViewPresenter
 from moneyflow.state import AppState
 from tests.mock_backend import MockMonarchMoney
 
@@ -19,6 +22,31 @@
 # ============================================================================
 
 
+def expected_amount(amount: float, for_table: bool = False) -> Union[str, Text]:
+    """
+    Format expected amount for test assertions.
+
+    Centralizes amount formatting expectations so tests are easy to update
+    when formatting logic changes. Currency symbol is NOT included in cell
+    values (it's shown in column header instead).
+
+    Args:
+        amount: The amount to format
+        for_table: If True, returns Rich Text object
+
+    Returns:
+        Expected formatted string (e.g., "-1,234.56", "+5,000.00")
+        Or Rich Text object if for_table=True
+
+    Examples:
+        >>> expected_amount(-1234.56)
+        '-1,234.56'
+        >>> expected_amount(5000.00)
+        '+5,000.00'
+    """
+    return ViewPresenter.format_amount(amount, for_table=for_table)
+
+
 def save_test_credentials(
     credential_manager,
     email: str = "[email protected]",