feat: initial commit

app/WYGIWYH/settings.py

@@ -379,7 +379,7 @@ DEBUG_TOOLBAR_PANELS = [
     "debug_toolbar.panels.signals.SignalsPanel",
     "debug_toolbar.panels.redirects.RedirectsPanel",
     "debug_toolbar.panels.profiling.ProfilingPanel",
-    # "cachalot.panels.CachalotPanel",
+    "cachalot.panels.CachalotPanel",
 ]
 INTERNAL_IPS = [
     "127.0.0.1",

app/apps/accounts/migrations/0016_account_untracked_by.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-09 05:52
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('accounts', '0015_alter_account_owner_alter_account_shared_with_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='account',
-            name='untracked_by',
-            field=models.ManyToManyField(blank=True, related_name='untracked_accounts', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

app/apps/accounts/models.py

@@ -1,11 +1,11 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
-from apps.common.middleware.thread_local import get_current_user
-from apps.common.models import SharedObject, SharedObjectManager
 from apps.transactions.models import Transaction
+from apps.common.models import SharedObject, SharedObjectManager
 
 
 class AccountGroup(SharedObject):
@@ -62,11 +62,6 @@ class Account(SharedObject):
         verbose_name=_("Archived"),
         help_text=_("Archived accounts don't show up nor count towards your net worth"),
     )
-    untracked_by = models.ManyToManyField(
-        settings.AUTH_USER_MODEL,
-        blank=True,
-        related_name="untracked_accounts",
-    )
 
     objects = SharedObjectManager()
     all_objects = models.Manager()  # Unfiltered manager
@@ -80,10 +75,6 @@ class Account(SharedObject):
     def __str__(self):
         return self.name
 
-    def is_untracked_by(self):
-        user = get_current_user()
-        return self.untracked_by.filter(pk=user.pk).exists()
-
     def clean(self):
         super().clean()
         if self.exchange_currency == self.currency:

app/apps/accounts/urls.py

@@ -31,11 +31,6 @@ urlpatterns = [
         views.account_take_ownership,
         name="account_take_ownership",
     ),
-    path(
-        "account/<int:pk>/toggle-untracked/",
-        views.account_toggle_untracked,
-        name="account_toggle_untracked",
-    ),
     path("account-groups/", views.account_groups_index, name="account_groups_index"),
     path("account-groups/list/", views.account_groups_list, name="account_groups_list"),
     path("account-groups/add/", views.account_group_add, name="account_group_add"),

app/apps/accounts/views/accounts.py

@@ -155,26 +155,6 @@ def account_delete(request, pk):
     )
 
 
-@only_htmx
-@login_required
-@require_http_methods(["GET"])
-def account_toggle_untracked(request, pk):
-    account = get_object_or_404(Account, id=pk)
-    if account.is_untracked_by():
-        account.untracked_by.remove(request.user)
-        messages.success(request, _("Account is now tracked"))
-    else:
-        account.untracked_by.add(request.user)
-        messages.success(request, _("Account is now untracked"))
-
-    return HttpResponse(
-        status=204,
-        headers={
-            "HX-Trigger": "updated",
-        },
-    )
-
-
 @only_htmx
 @login_required
 @require_http_methods(["GET"])

app/apps/api/serializers/transactions.py

@@ -138,7 +138,6 @@ class RecurringTransactionSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         instance = super().update(instance, validated_data)
         instance.update_unpaid_transactions()
-        instance.generate_upcoming_transactions()
         return instance
 
 

app/apps/common/fields/forms/dynamic_select.py

@@ -139,6 +139,7 @@ class DynamicModelMultipleChoiceField(forms.ModelMultipleChoiceField):
                     instance.save()
                     return instance
         except Exception as e:
+            print(e)
             raise ValidationError(_("Error creating new instance"))
 
     def clean(self, value):

app/apps/common/functions/format.py

@@ -5,12 +5,7 @@ from django.utils.formats import get_format as original_get_format
 def get_format(format_type=None, lang=None, use_l10n=None):
     user = get_current_user()
 
-    if (
-        user
-        and user.is_authenticated
-        and hasattr(user, "settings")
-        and use_l10n is not False
-    ):
+    if user and user.is_authenticated and hasattr(user, "settings") and use_l10n:
         user_settings = user.settings
         if format_type == "THOUSAND_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)
@@ -18,13 +13,11 @@ def get_format(format_type=None, lang=None, use_l10n=None):
                 return "."
             elif number_format == "CD":
                 return ","
-            elif number_format == "SD" or number_format == "SC":
-                return " "
         elif format_type == "DECIMAL_SEPARATOR":
             number_format = getattr(user_settings, "number_format", None)
-            if number_format == "DC" or number_format == "SC":
+            if number_format == "DC":
                 return ","
-            elif number_format == "CD" or number_format == "SD":
+            elif number_format == "CD":
                 return "."
         elif format_type == "SHORT_DATE_FORMAT":
             date_format = getattr(user_settings, "date_format", None)

app/apps/common/views.py

@@ -91,12 +91,6 @@ def month_year_picker(request):
         for date in all_months
     ]
 
-    today_url = (
-        reverse(url, kwargs={"month": current_date.month, "year": current_date.year})
-        if url
-        else ""
-    )
-
     return render(
         request,
         "common/fragments/month_year_picker.html",
@@ -104,7 +98,6 @@ def month_year_picker(request):
             "month_year_data": result,
             "current_month": current_month,
             "current_year": current_year,
-            "today_url": today_url,
         },
     )
 

app/apps/common/widgets/decimal.py

@@ -35,7 +35,8 @@ class ArbitraryDecimalDisplayNumberInput(forms.TextInput):
         self.attrs.update(
             {
                 "x-data": "",
-                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', '{get_format('THOUSAND_SEPARATOR')}', '30')",
+                "x-mask:dynamic": f"$money($input, '{get_format('DECIMAL_SEPARATOR')}', "
+                f"'{get_format('THOUSAND_SEPARATOR')}', '30')",
                 "x-on:keyup": "$el.dispatchEvent(new Event('input'))",
             }
         )

app/apps/currencies/exchange_rates/fetcher.py

@@ -4,7 +4,13 @@ from datetime import timedelta
 from django.db.models import QuerySet
 from django.utils import timezone
 
-import apps.currencies.exchange_rates.providers as providers
+from apps.currencies.exchange_rates.providers import (
+    SynthFinanceProvider,
+    SynthFinanceStockProvider,
+    CoinGeckoFreeProvider,
+    CoinGeckoProProvider,
+    TransitiveRateProvider,
+)
 from apps.currencies.models import ExchangeRateService, ExchangeRate, Currency
 
 logger = logging.getLogger(__name__)
@@ -12,12 +18,11 @@ logger = logging.getLogger(__name__)
 
 # Map service types to provider classes
 PROVIDER_MAPPING = {
-    "coingecko_free": providers.CoinGeckoFreeProvider,
-    "coingecko_pro": providers.CoinGeckoProProvider,
-    "transitive": providers.TransitiveRateProvider,
-    "frankfurter": providers.FrankfurterProvider,
-    "twelvedata": providers.TwelveDataProvider,
-    "twelvedatamarkets": providers.TwelveDataMarketsProvider,
+    "synth_finance": SynthFinanceProvider,
+    "synth_finance_stock": SynthFinanceStockProvider,
+    "coingecko_free": CoinGeckoFreeProvider,
+    "coingecko_pro": CoinGeckoProProvider,
+    "transitive": TransitiveRateProvider,
 }
 
 
@@ -198,63 +203,21 @@ class ExchangeRateFetcher:
 
                 if provider.rates_inverted:
                     # If rates are inverted, we need to swap currencies
-                    if service.singleton:
-                        # Try to get the last automatically created exchange rate
-                        exchange_rate = (
-                            ExchangeRate.objects.filter(
-                                automatic=True,
-                                from_currency=to_currency,
-                                to_currency=from_currency,
-                            )
-                            .order_by("-date")
-                            .first()
-                        )
-                    else:
-                        exchange_rate = None
-
-                    if not exchange_rate:
-                        ExchangeRate.objects.create(
-                            automatic=True,
-                            from_currency=to_currency,
-                            to_currency=from_currency,
-                            rate=rate,
-                            date=timezone.now(),
-                        )
-                    else:
-                        exchange_rate.rate = rate
-                        exchange_rate.date = timezone.now()
-                        exchange_rate.save()
-
+                    ExchangeRate.objects.create(
+                        from_currency=to_currency,
+                        to_currency=from_currency,
+                        rate=rate,
+                        date=timezone.now(),
+                    )
                     processed_pairs.add((to_currency.id, from_currency.id))
                 else:
                     # If rates are not inverted, we can use them as is
-                    if service.singleton:
-                        # Try to get the last automatically created exchange rate
-                        exchange_rate = (
-                            ExchangeRate.objects.filter(
-                                automatic=True,
-                                from_currency=from_currency,
-                                to_currency=to_currency,
-                            )
-                            .order_by("-date")
-                            .first()
-                        )
-                    else:
-                        exchange_rate = None
-
-                    if not exchange_rate:
-                        ExchangeRate.objects.create(
-                            automatic=True,
-                            from_currency=from_currency,
-                            to_currency=to_currency,
-                            rate=rate,
-                            date=timezone.now(),
-                        )
-                    else:
-                        exchange_rate.rate = rate
-                        exchange_rate.date = timezone.now()
-                        exchange_rate.save()
-
+                    ExchangeRate.objects.create(
+                        from_currency=from_currency,
+                        to_currency=to_currency,
+                        rate=rate,
+                        date=timezone.now(),
+                    )
                     processed_pairs.add((from_currency.id, to_currency.id))
 
             service.last_fetch = timezone.now()

app/apps/currencies/exchange_rates/providers.py

@@ -13,6 +13,70 @@ from apps.currencies.exchange_rates.base import ExchangeRateProvider
 logger = logging.getLogger(__name__)
 
 
+class SynthFinanceProvider(ExchangeRateProvider):
+    """Implementation for Synth Finance API (synthfinance.com)"""
+
+    BASE_URL = "https://api.synthfinance.com/rates/live"
+    rates_inverted = False  # SynthFinance returns non-inverted rates
+
+    def __init__(self, api_key: str = None):
+        super().__init__(api_key)
+        self.session = requests.Session()
+        self.session.headers.update({"Authorization": f"Bearer {self.api_key}"})
+
+    def get_rates(
+        self, target_currencies: QuerySet, exchange_currencies: set
+    ) -> List[Tuple[Currency, Currency, Decimal]]:
+        results = []
+        currency_groups = {}
+        for currency in target_currencies:
+            if currency.exchange_currency in exchange_currencies:
+                group = currency_groups.setdefault(currency.exchange_currency.code, [])
+                group.append(currency)
+
+        for base_currency, currencies in currency_groups.items():
+            try:
+                to_currencies = ",".join(
+                    currency.code
+                    for currency in currencies
+                    if currency.code != base_currency
+                )
+                response = self.session.get(
+                    f"{self.BASE_URL}",
+                    params={"from": base_currency, "to": to_currencies},
+                )
+                response.raise_for_status()
+                data = response.json()
+                rates = data["data"]["rates"]
+
+                for currency in currencies:
+                    if currency.code == base_currency:
+                        rate = Decimal("1")
+                    else:
+                        rate = Decimal(str(rates[currency.code]))
+                    # Return the rate as is, without inversion
+                    results.append((currency.exchange_currency, currency, rate))
+
+                credits_used = data["meta"]["credits_used"]
+                credits_remaining = data["meta"]["credits_remaining"]
+                logger.info(
+                    f"Synth Finance API call: {credits_used} credits used, {credits_remaining} remaining"
+                )
+            except requests.RequestException as e:
+                logger.error(
+                    f"Error fetching rates from Synth Finance API for base {base_currency}: {e}"
+                )
+            except KeyError as e:
+                logger.error(
+                    f"Unexpected response structure from Synth Finance API for base {base_currency}: {e}"
+                )
+            except Exception as e:
+                logger.error(
+                    f"Unexpected error processing Synth Finance data for base {base_currency}: {e}"
+                )
+        return results
+
+
 class CoinGeckoFreeProvider(ExchangeRateProvider):
     """Implementation for CoinGecko Free API"""
 
@@ -88,6 +152,71 @@ class CoinGeckoProProvider(CoinGeckoFreeProvider):
         self.session.headers.update({"x-cg-pro-api-key": api_key})
 
 
+class SynthFinanceStockProvider(ExchangeRateProvider):
+    """Implementation for Synth Finance API Real-Time Prices endpoint (synthfinance.com)"""
+
+    BASE_URL = "https://api.synthfinance.com/tickers"
+    rates_inverted = True
+
+    def __init__(self, api_key: str = None):
+        super().__init__(api_key)
+        self.session = requests.Session()
+        self.session.headers.update(
+            {"Authorization": f"Bearer {self.api_key}", "accept": "application/json"}
+        )
+
+    def get_rates(
+        self, target_currencies: QuerySet, exchange_currencies: set
+    ) -> List[Tuple[Currency, Currency, Decimal]]:
+        results = []
+
+        for currency in target_currencies:
+            if currency.exchange_currency not in exchange_currencies:
+                continue
+
+            try:
+                # Same currency has rate of 1
+                if currency.code == currency.exchange_currency.code:
+                    rate = Decimal("1")
+                    results.append((currency.exchange_currency, currency, rate))
+                    continue
+
+                # Fetch real-time price for this ticker
+                response = self.session.get(
+                    f"{self.BASE_URL}/{currency.code}/real-time"
+                )
+                response.raise_for_status()
+                data = response.json()
+
+                # Use fair market value as the rate
+                rate = Decimal(data["data"]["fair_market_value"])
+                results.append((currency.exchange_currency, currency, rate))
+
+                # Log API usage
+                credits_used = data["meta"]["credits_used"]
+                credits_remaining = data["meta"]["credits_remaining"]
+                logger.info(
+                    f"Synth Finance API call for {currency.code}: {credits_used} credits used, {credits_remaining} remaining"
+                )
+            except requests.RequestException as e:
+                logger.error(
+                    f"Error fetching rate from Synth Finance API for ticker {currency.code}: {e}",
+                    exc_info=True,
+                )
+            except KeyError as e:
+                logger.error(
+                    f"Unexpected response structure from Synth Finance API for ticker {currency.code}: {e}",
+                    exc_info=True,
+                )
+            except Exception as e:
+                logger.error(
+                    f"Unexpected error processing Synth Finance data for ticker {currency.code}: {e}",
+                    exc_info=True,
+                )
+
+        return results
+
+
 class TransitiveRateProvider(ExchangeRateProvider):
     """Calculates exchange rates through paths of existing rates"""
 
@@ -177,329 +306,3 @@ class TransitiveRateProvider(ExchangeRateProvider):
                     queue.append((neighbor, path + [neighbor], current_rate * rate))
 
         return None, None
-
-
-class FrankfurterProvider(ExchangeRateProvider):
-    """Implementation for the Frankfurter API (frankfurter.dev)"""
-
-    BASE_URL = "https://api.frankfurter.dev/v1/latest"
-    rates_inverted = (
-        False  # Frankfurter returns non-inverted rates (e.g., 1 EUR = 1.1 USD)
-    )
-
-    def __init__(self, api_key: str = None):
-        """
-        Initializes the provider. The Frankfurter API does not require an API key,
-        so the api_key parameter is ignored.
-        """
-        super().__init__(api_key)
-        self.session = requests.Session()
-
-    @classmethod
-    def requires_api_key(cls) -> bool:
-        return False
-
-    def get_rates(
-        self, target_currencies: QuerySet, exchange_currencies: set
-    ) -> List[Tuple[Currency, Currency, Decimal]]:
-        results = []
-        currency_groups = {}
-        # Group target currencies by their exchange (base) currency to minimize API calls
-        for currency in target_currencies:
-            if currency.exchange_currency in exchange_currencies:
-                group = currency_groups.setdefault(currency.exchange_currency.code, [])
-                group.append(currency)
-
-        # Make one API call for each base currency
-        for base_currency, currencies in currency_groups.items():
-            try:
-                # Create a comma-separated list of target currency codes
-                to_currencies = ",".join(
-                    currency.code
-                    for currency in currencies
-                    if currency.code != base_currency
-                )
-
-                # If there are no target currencies other than the base, skip the API call
-                if not to_currencies:
-                    # Handle the case where the only request is for the base rate (e.g., USD to USD)
-                    for currency in currencies:
-                        if currency.code == base_currency:
-                            results.append(
-                                (currency.exchange_currency, currency, Decimal("1"))
-                            )
-                    continue
-
-                response = self.session.get(
-                    self.BASE_URL,
-                    params={"base": base_currency, "symbols": to_currencies},
-                )
-                response.raise_for_status()
-                data = response.json()
-                rates = data["rates"]
-
-                # Process the returned rates
-                for currency in currencies:
-                    if currency.code == base_currency:
-                        # The rate for the base currency to itself is always 1
-                        rate = Decimal("1")
-                    else:
-                        rate = Decimal(str(rates[currency.code]))
-
-                    results.append((currency.exchange_currency, currency, rate))
-
-            except requests.RequestException as e:
-                logger.error(
-                    f"Error fetching rates from Frankfurter API for base {base_currency}: {e}"
-                )
-            except KeyError as e:
-                logger.error(
-                    f"Unexpected response structure from Frankfurter API for base {base_currency}: {e}"
-                )
-            except Exception as e:
-                logger.error(
-                    f"Unexpected error processing Frankfurter data for base {base_currency}: {e}"
-                )
-        return results
-
-
-class TwelveDataProvider(ExchangeRateProvider):
-    """Implementation for the Twelve Data API (twelvedata.com)"""
-
-    BASE_URL = "https://api.twelvedata.com/exchange_rate"
-    rates_inverted = (
-        False  # The API returns direct rates, e.g., for EUR/USD it's 1 EUR = X USD
-    )
-
-    def __init__(self, api_key: str):
-        """
-        Initializes the provider with an API key and a requests session.
-        """
-        super().__init__(api_key)
-        self.session = requests.Session()
-
-    @classmethod
-    def requires_api_key(cls) -> bool:
-        """This provider requires an API key."""
-        return True
-
-    def get_rates(
-        self, target_currencies: QuerySet, exchange_currencies: set
-    ) -> List[Tuple[Currency, Currency, Decimal]]:
-        """
-        Fetches exchange rates from the Twelve Data API for the given currency pairs.
-
-        This provider makes one API call for each requested currency pair.
-        """
-        results = []
-
-        for target_currency in target_currencies:
-            # Ensure the target currency's exchange currency is one we're interested in
-            if target_currency.exchange_currency not in exchange_currencies:
-                continue
-
-            base_currency = target_currency.exchange_currency
-
-            # The exchange rate for the same currency is always 1
-            if base_currency.code == target_currency.code:
-                rate = Decimal("1")
-                results.append((base_currency, target_currency, rate))
-                continue
-
-            # Construct the symbol in the format "BASE/TARGET", e.g., "EUR/USD"
-            symbol = f"{base_currency.code}/{target_currency.code}"
-
-            try:
-                params = {
-                    "symbol": symbol,
-                    "apikey": self.api_key,
-                }
-
-                response = self.session.get(self.BASE_URL, params=params)
-                response.raise_for_status()  # Raise an HTTPError for bad responses (4xx or 5xx)
-
-                data = response.json()
-
-                # The API may return an error message in a JSON object
-                if "rate" not in data:
-                    error_message = data.get("message", "Rate not found in response.")
-                    logger.error(
-                        f"Could not fetch rate for {symbol} from Twelve Data: {error_message}"
-                    )
-                    continue
-
-                # Convert the rate to a Decimal for precision
-                rate = Decimal(str(data["rate"]))
-                results.append((base_currency, target_currency, rate))
-
-                logger.info(f"Successfully fetched rate for {symbol} from Twelve Data.")
-
-                time.sleep(
-                    60
-                )  # We sleep every pair as to not step over TwelveData's minute limit
-
-            except requests.RequestException as e:
-                logger.error(
-                    f"Error fetching rate from Twelve Data API for symbol {symbol}: {e}"
-                )
-            except KeyError as e:
-                logger.error(
-                    f"Unexpected response structure from Twelve Data API for symbol {symbol}: Missing key {e}"
-                )
-            except Exception as e:
-                logger.error(
-                    f"An unexpected error occurred while processing Twelve Data for {symbol}: {e}"
-                )
-
-        return results
-
-
-class TwelveDataMarketsProvider(ExchangeRateProvider):
-    """
-    Provides prices for market instruments (stocks, ETFs, etc.) using the Twelve Data API.
-
-    This provider performs a multi-step process:
-    1. Parses instrument codes which can be symbols, FIGI, CUSIP, or ISIN.
-    2. For CUSIPs, it defaults the currency to USD. For all others, it searches
-       for the instrument to determine its native trading currency.
-    3. Fetches the latest price for the instrument in its native currency.
-    4. Converts the price to the requested target exchange currency.
-    """
-
-    SYMBOL_SEARCH_URL = "https://api.twelvedata.com/symbol_search"
-    PRICE_URL = "https://api.twelvedata.com/price"
-    EXCHANGE_RATE_URL = "https://api.twelvedata.com/exchange_rate"
-
-    rates_inverted = True
-
-    def __init__(self, api_key: str):
-        super().__init__(api_key)
-        self.session = requests.Session()
-
-    @classmethod
-    def requires_api_key(cls) -> bool:
-        return True
-
-    def _parse_code(self, raw_code: str) -> Tuple[str, str]:
-        """Parses the raw code to determine its type and value."""
-        if raw_code.startswith("figi:"):
-            return "figi", raw_code.removeprefix("figi:")
-        if raw_code.startswith("cusip:"):
-            return "cusip", raw_code.removeprefix("cusip:")
-        if raw_code.startswith("isin:"):
-            return "isin", raw_code.removeprefix("isin:")
-        return "symbol", raw_code
-
-    def get_rates(
-        self, target_currencies: QuerySet, exchange_currencies: set
-    ) -> List[Tuple[Currency, Currency, Decimal]]:
-        results = []
-
-        for asset in target_currencies:
-            if asset.exchange_currency not in exchange_currencies:
-                continue
-
-            code_type, code_value = self._parse_code(asset.code)
-            original_currency_code = None
-
-            try:
-                # Determine the instrument's native currency
-                if code_type == "cusip":
-                    # CUSIP codes always default to USD
-                    original_currency_code = "USD"
-                    logger.info(f"Defaulting CUSIP {code_value} to USD currency.")
-                else:
-                    # For all other types, find currency via symbol search
-                    search_params = {"symbol": code_value, "apikey": "demo"}
-                    search_res = self.session.get(
-                        self.SYMBOL_SEARCH_URL, params=search_params
-                    )
-                    search_res.raise_for_status()
-                    search_data = search_res.json()
-
-                    if not search_data.get("data"):
-                        logger.warning(
-                            f"TwelveDataMarkets: Symbol search for '{code_value}' returned no results."
-                        )
-                        continue
-
-                    instrument_data = search_data["data"][0]
-                    original_currency_code = instrument_data.get("currency")
-
-                if not original_currency_code:
-                    logger.error(
-                        f"TwelveDataMarkets: Could not determine original currency for '{code_value}'."
-                    )
-                    continue
-
-                # Get the instrument's price in its native currency
-                price_params = {code_type: code_value, "apikey": self.api_key}
-                price_res = self.session.get(self.PRICE_URL, params=price_params)
-                price_res.raise_for_status()
-                price_data = price_res.json()
-
-                if "price" not in price_data:
-                    error_message = price_data.get(
-                        "message", "Price key not found in response"
-                    )
-                    logger.error(
-                        f"TwelveDataMarkets: Could not get price for {code_type} '{code_value}': {error_message}"
-                    )
-                    continue
-
-                price_in_original_currency = Decimal(price_data["price"])
-
-                # Convert price to the target exchange currency
-                target_exchange_currency = asset.exchange_currency
-
-                if (
-                    original_currency_code.upper()
-                    == target_exchange_currency.code.upper()
-                ):
-                    final_price = price_in_original_currency
-                else:
-                    rate_symbol = (
-                        f"{original_currency_code}/{target_exchange_currency.code}"
-                    )
-                    rate_params = {"symbol": rate_symbol, "apikey": self.api_key}
-                    rate_res = self.session.get(
-                        self.EXCHANGE_RATE_URL, params=rate_params
-                    )
-                    rate_res.raise_for_status()
-                    rate_data = rate_res.json()
-
-                    if "rate" not in rate_data:
-                        error_message = rate_data.get(
-                            "message", "Rate key not found in response"
-                        )
-                        logger.error(
-                            f"TwelveDataMarkets: Could not get conversion rate for '{rate_symbol}': {error_message}"
-                        )
-                        continue
-
-                    conversion_rate = Decimal(str(rate_data["rate"]))
-                    final_price = price_in_original_currency * conversion_rate
-
-                results.append((target_exchange_currency, asset, final_price))
-                logger.info(
-                    f"Successfully processed price for {asset.code} as {final_price} {target_exchange_currency.code}"
-                )
-
-                time.sleep(
-                    60
-                )  # We sleep every pair as to not step over TwelveData's minute limit
-
-            except requests.RequestException as e:
-                logger.error(
-                    f"TwelveDataMarkets: API request failed for {code_value}: {e}"
-                )
-            except (KeyError, IndexError) as e:
-                logger.error(
-                    f"TwelveDataMarkets: Error processing API response for {code_value}: {e}"
-                )
-            except Exception as e:
-                logger.error(
-                    f"TwelveDataMarkets: An unexpected error occurred for {code_value}: {e}"
-                )
-
-        return results

app/apps/currencies/forms.py

@@ -114,7 +114,6 @@ class ExchangeRateServiceForm(forms.ModelForm):
             "fetch_interval",
             "target_currencies",
             "target_accounts",
-            "singleton",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -127,7 +126,6 @@ class ExchangeRateServiceForm(forms.ModelForm):
             "name",
             "service_type",
             Switch("is_active"),
-            Switch("singleton"),
             "api_key",
             Row(
                 Column("interval_type", css_class="form-group col-md-6"),

app/apps/currencies/migrations/0015_exchangerate_automatic_exchangerateservice_singleton.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-08 02:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0014_alter_currency_options'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='exchangerate',
-            name='automatic',
-            field=models.BooleanField(default=False, verbose_name='Automatic'),
-        ),
-        migrations.AddField(
-            model_name='exchangerateservice',
-            name='singleton',
-            field=models.BooleanField(default=False, help_text='Create one exchange rate and keep updating it. Avoids database clutter.', verbose_name='Single exchange rate'),
-        ),
-    ]

app/apps/currencies/migrations/0016_alter_exchangerate_automatic.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-08 02:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0015_exchangerate_automatic_exchangerateservice_singleton'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exchangerate',
-            name='automatic',
-            field=models.BooleanField(default=False, verbose_name='Auto'),
-        ),
-    ]

app/apps/currencies/migrations/0017_alter_exchangerateservice_service_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-16 22:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0016_alter_exchangerate_automatic'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exchangerateservice',
-            name='service_type',
-            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter')], max_length=255, verbose_name='Service Type'),
-        ),
-    ]

app/apps/currencies/migrations/0018_alter_exchangerateservice_service_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-17 03:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0017_alter_exchangerateservice_service_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exchangerateservice',
-            name='service_type',
-            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData')], max_length=255, verbose_name='Service Type'),
-        ),
-    ]

app/apps/currencies/migrations/0019_alter_exchangerateservice_service_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-17 06:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0018_alter_exchangerateservice_service_type'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exchangerateservice',
-            name='service_type',
-            field=models.CharField(choices=[('synth_finance', 'Synth Finance'), ('synth_finance_stock', 'Synth Finance Stock'), ('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData'), ('twelvedatamarkets', 'TwelveData Markets')], max_length=255, verbose_name='Service Type'),
-        ),
-    ]

app/apps/currencies/migrations/0020_migrate_synth_finance_services.py

@@ -1,51 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-17 06:25
-
-from django.db import migrations
-
-# The new value we are migrating to
-NEW_SERVICE_TYPE = "frankfurter"
-# The old values we are deprecating
-OLD_SERVICE_TYPE_TO_UPDATE = "synth_finance"
-OLD_SERVICE_TYPE_TO_DELETE = "synth_finance_stock"
-
-
-def forwards_func(apps, schema_editor):
-    """
-    Forward migration:
-    - Deletes all ExchangeRateService instances with service_type 'synth_finance_stock'.
-    - Updates all ExchangeRateService instances with service_type 'synth_finance' to 'frankfurter'.
-    """
-    ExchangeRateService = apps.get_model("currencies", "ExchangeRateService")
-    db_alias = schema_editor.connection.alias
-
-    # 1. Delete the SYNTH_FINANCE_STOCK entries
-    ExchangeRateService.objects.using(db_alias).filter(
-        service_type=OLD_SERVICE_TYPE_TO_DELETE
-    ).delete()
-
-    # 2. Update the SYNTH_FINANCE entries to FRANKFURTER
-    ExchangeRateService.objects.using(db_alias).filter(
-        service_type=OLD_SERVICE_TYPE_TO_UPDATE
-    ).update(service_type=NEW_SERVICE_TYPE, api_key=None)
-
-
-def backwards_func(apps, schema_editor):
-    """
-    Backward migration: This operation is not safely reversible.
-    - We cannot know which 'frankfurter' services were originally 'synth_finance'.
-    - The deleted 'synth_finance_stock' services cannot be recovered.
-    We will leave this function empty to allow migrating backwards without doing anything.
-    """
-    pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        # Add the previous migration file here
-        ("currencies", "0019_alter_exchangerateservice_service_type"),
-    ]
-
-    operations = [
-        migrations.RunPython(forwards_func, reverse_code=backwards_func),
-    ]

app/apps/currencies/migrations/0021_alter_exchangerateservice_service_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-17 06:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0020_migrate_synth_finance_services'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='exchangerateservice',
-            name='service_type',
-            field=models.CharField(choices=[('coingecko_free', 'CoinGecko (Demo/Free)'), ('coingecko_pro', 'CoinGecko (Pro)'), ('transitive', 'Transitive (Calculated from Existing Rates)'), ('frankfurter', 'Frankfurter'), ('twelvedata', 'TwelveData'), ('twelvedatamarkets', 'TwelveData Markets')], max_length=255, verbose_name='Service Type'),
-        ),
-    ]

app/apps/currencies/models.py

@@ -70,8 +70,6 @@ class ExchangeRate(models.Model):
     )
     date = models.DateTimeField(verbose_name=_("Date and Time"))
 
-    automatic = models.BooleanField(verbose_name=_("Auto"), default=False)
-
     class Meta:
         verbose_name = _("Exchange Rate")
         verbose_name_plural = _("Exchange Rates")
@@ -94,12 +92,11 @@ class ExchangeRateService(models.Model):
     """Configuration for exchange rate services"""
 
     class ServiceType(models.TextChoices):
+        SYNTH_FINANCE = "synth_finance", "Synth Finance"
+        SYNTH_FINANCE_STOCK = "synth_finance_stock", "Synth Finance Stock"
         COINGECKO_FREE = "coingecko_free", "CoinGecko (Demo/Free)"
         COINGECKO_PRO = "coingecko_pro", "CoinGecko (Pro)"
         TRANSITIVE = "transitive", "Transitive (Calculated from Existing Rates)"
-        FRANKFURTER = "frankfurter", "Frankfurter"
-        TWELVEDATA = "twelvedata", "TwelveData"
-        TWELVEDATA_MARKETS = "twelvedatamarkets", "TwelveData Markets"
 
     class IntervalType(models.TextChoices):
         ON = "on", _("On")
@@ -151,14 +148,6 @@ class ExchangeRateService(models.Model):
         blank=True,
     )
 
-    singleton = models.BooleanField(
-        verbose_name=_("Single exchange rate"),
-        default=False,
-        help_text=_(
-            "Create one exchange rate and keep updating it. Avoids database clutter."
-        ),
-    )
-
     class Meta:
         verbose_name = _("Exchange Rate Service")
         verbose_name_plural = _("Exchange Rate Services")

app/apps/insights/utils/category_overview.py

@@ -9,9 +9,7 @@ from apps.currencies.models import Currency
 from apps.currencies.utils.convert import convert
 
 
-def get_categories_totals(
-    transactions_queryset, ignore_empty=False, show_entities=False
-):
+def get_categories_totals(transactions_queryset, ignore_empty=False):
     # First get the category totals as before
     category_currency_metrics = (
         transactions_queryset.values(
@@ -242,7 +240,6 @@ def get_categories_totals(
                 result[category_id]["tags"][tag_key] = {
                     "name": tag_name,
                     "currencies": {},
-                    "entities": {},
                 }
 
             currency_id = tag_metric["account__currency"]
@@ -322,173 +319,4 @@ def get_categories_totals(
                 currency_id
             ] = tag_currency_data
 
-    if show_entities:
-        entity_metrics = transactions_queryset.values(
-            "category",
-            "tags",
-            "entities",
-            "entities__name",
-            "account__currency",
-            "account__currency__code",
-            "account__currency__name",
-            "account__currency__decimal_places",
-            "account__currency__prefix",
-            "account__currency__suffix",
-            "account__currency__exchange_currency",
-        ).annotate(
-            expense_current=Coalesce(
-                Sum(
-                    Case(
-                        When(
-                            type=Transaction.Type.EXPENSE, is_paid=True, then="amount"
-                        ),
-                        default=Value(0),
-                        output_field=models.DecimalField(),
-                    )
-                ),
-                Decimal("0"),
-            ),
-            expense_projected=Coalesce(
-                Sum(
-                    Case(
-                        When(
-                            type=Transaction.Type.EXPENSE, is_paid=False, then="amount"
-                        ),
-                        default=Value(0),
-                        output_field=models.DecimalField(),
-                    )
-                ),
-                Decimal("0"),
-            ),
-            income_current=Coalesce(
-                Sum(
-                    Case(
-                        When(type=Transaction.Type.INCOME, is_paid=True, then="amount"),
-                        default=Value(0),
-                        output_field=models.DecimalField(),
-                    )
-                ),
-                Decimal("0"),
-            ),
-            income_projected=Coalesce(
-                Sum(
-                    Case(
-                        When(
-                            type=Transaction.Type.INCOME, is_paid=False, then="amount"
-                        ),
-                        default=Value(0),
-                        output_field=models.DecimalField(),
-                    )
-                ),
-                Decimal("0"),
-            ),
-        )
-
-        for entity_metric in entity_metrics:
-            category_id = entity_metric["category"]
-            tag_id = entity_metric["tags"]
-            entity_id = entity_metric["entities"]
-
-            if not entity_id:
-                continue
-
-            if category_id in result:
-                tag_key = tag_id if tag_id is not None else "untagged"
-                if tag_key in result[category_id]["tags"]:
-                    entity_key = entity_id
-                    entity_name = entity_metric["entities__name"]
-
-                    if "entities" not in result[category_id]["tags"][tag_key]:
-                        result[category_id]["tags"][tag_key]["entities"] = {}
-
-                    if (
-                        entity_key
-                        not in result[category_id]["tags"][tag_key]["entities"]
-                    ):
-                        result[category_id]["tags"][tag_key]["entities"][entity_key] = {
-                            "name": entity_name,
-                            "currencies": {},
-                        }
-
-                    currency_id = entity_metric["account__currency"]
-
-                    entity_total_current = (
-                        entity_metric["income_current"]
-                        - entity_metric["expense_current"]
-                    )
-                    entity_total_projected = (
-                        entity_metric["income_projected"]
-                        - entity_metric["expense_projected"]
-                    )
-                    entity_total_income = (
-                        entity_metric["income_current"]
-                        + entity_metric["income_projected"]
-                    )
-                    entity_total_expense = (
-                        entity_metric["expense_current"]
-                        + entity_metric["expense_projected"]
-                    )
-                    entity_total_final = entity_total_current + entity_total_projected
-
-                    entity_currency_data = {
-                        "currency": {
-                            "code": entity_metric["account__currency__code"],
-                            "name": entity_metric["account__currency__name"],
-                            "decimal_places": entity_metric[
-                                "account__currency__decimal_places"
-                            ],
-                            "prefix": entity_metric["account__currency__prefix"],
-                            "suffix": entity_metric["account__currency__suffix"],
-                        },
-                        "expense_current": entity_metric["expense_current"],
-                        "expense_projected": entity_metric["expense_projected"],
-                        "total_expense": entity_total_expense,
-                        "income_current": entity_metric["income_current"],
-                        "income_projected": entity_metric["income_projected"],
-                        "total_income": entity_total_income,
-                        "total_current": entity_total_current,
-                        "total_projected": entity_total_projected,
-                        "total_final": entity_total_final,
-                    }
-
-                    if entity_metric["account__currency__exchange_currency"]:
-                        from_currency = Currency.objects.get(id=currency_id)
-                        exchange_currency = Currency.objects.get(
-                            id=entity_metric["account__currency__exchange_currency"]
-                        )
-
-                        exchanged = {}
-                        for field in [
-                            "expense_current",
-                            "expense_projected",
-                            "income_current",
-                            "income_projected",
-                            "total_income",
-                            "total_expense",
-                            "total_current",
-                            "total_projected",
-                            "total_final",
-                        ]:
-                            amount, prefix, suffix, decimal_places = convert(
-                                amount=entity_currency_data[field],
-                                from_currency=from_currency,
-                                to_currency=exchange_currency,
-                            )
-                            if amount is not None:
-                                exchanged[field] = amount
-                                if "currency" not in exchanged:
-                                    exchanged["currency"] = {
-                                        "prefix": prefix,
-                                        "suffix": suffix,
-                                        "decimal_places": decimal_places,
-                                        "code": exchange_currency.code,
-                                        "name": exchange_currency.name,
-                                    }
-                        if exchanged:
-                            entity_currency_data["exchanged"] = exchanged
-
-                    result[category_id]["tags"][tag_key]["entities"][entity_key][
-                        "currencies"
-                    ][currency_id] = entity_currency_data
-
     return result

app/apps/insights/utils/transactions.py

@@ -13,9 +13,7 @@ from apps.insights.forms import (
 )
 
 
-def get_transactions(
-    request, include_unpaid=True, include_silent=False, include_untracked_accounts=False
-):
+def get_transactions(request, include_unpaid=True, include_silent=False):
     transactions = Transaction.objects.all()
 
     filter_type = request.GET.get("type", None)
@@ -97,9 +95,4 @@ def get_transactions(
             Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True)
         )
 
-    if not include_untracked_accounts:
-        transactions = transactions.exclude(
-            account__in=request.user.untracked_accounts.all()
-        )
-
     return transactions

app/apps/insights/views.py

@@ -74,7 +74,7 @@ def index(request):
 def sankey_by_account(request):
     # Get filtered transactions
 
-    transactions = get_transactions(request, include_untracked_accounts=True)
+    transactions = get_transactions(request)
 
     # Generate Sankey data
     sankey_data = generate_sankey_data_by_account(transactions)
@@ -180,14 +180,6 @@ def category_overview(request):
     else:
         show_tags = request.session.get("insights_category_explorer_show_tags", True)
 
-    if "show_entities" in request.GET:
-        show_entities = request.GET["show_entities"] == "on"
-        request.session["insights_category_explorer_show_entities"] = show_entities
-    else:
-        show_entities = request.session.get(
-            "insights_category_explorer_show_entities", False
-        )
-
     if "showing" in request.GET:
         showing = request.GET["showing"]
         request.session["insights_category_explorer_showing"] = showing
@@ -198,9 +190,7 @@ def category_overview(request):
     transactions = get_transactions(request, include_silent=True)
 
     total_table = get_categories_totals(
-        transactions_queryset=transactions,
-        ignore_empty=False,
-        show_entities=show_entities,
+        transactions_queryset=transactions, ignore_empty=False
     )
 
     return render(
@@ -210,7 +200,6 @@ def category_overview(request):
             "total_table": total_table,
             "view_type": view_type,
             "show_tags": show_tags,
-            "show_entities": show_entities,
             "showing": showing,
         },
     )
@@ -250,14 +239,10 @@ def late_transactions(request):
 @login_required
 @require_http_methods(["GET"])
 def emergency_fund(request):
-    transactions_currency_queryset = (
-        Transaction.objects.filter(
-            is_paid=True, account__is_archived=False, account__is_asset=False
-        )
-        .exclude(account__in=request.user.untracked_accounts.all())
-        .order_by(
-            "account__currency__name",
-        )
+    transactions_currency_queryset = Transaction.objects.filter(
+        is_paid=True, account__is_archived=False, account__is_asset=False
+    ).order_by(
+        "account__currency__name",
     )
     currency_net_worth = calculate_currency_totals(
         transactions_queryset=transactions_currency_queryset, ignore_empty=False
@@ -277,7 +262,6 @@ def emergency_fund(request):
             category__mute=False,
             mute=False,
         )
-        .exclude(account__in=request.user.untracked_accounts.all())
         .values("reference_date", "account__currency")
         .annotate(monthly_total=Sum("amount"))
     )

app/apps/monthly_overview/views.py

@@ -107,15 +107,9 @@ def transactions_list(request, month: int, year: int):
 @require_http_methods(["GET"])
 def monthly_summary(request, month: int, year: int):
     # Base queryset with all required filters
-    base_queryset = (
-        Transaction.objects.filter(
-            reference_date__year=year,
-            reference_date__month=month,
-            account__is_asset=False,
-        )
-        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-        .exclude(account__in=request.user.untracked_accounts.all())
-    )
+    base_queryset = Transaction.objects.filter(
+        reference_date__year=year, reference_date__month=month, account__is_asset=False
+    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
 
     data = calculate_currency_totals(base_queryset, ignore_empty=True)
     percentages = calculate_percentage_distribution(data)
@@ -171,14 +165,10 @@ def monthly_account_summary(request, month: int, year: int):
 @require_http_methods(["GET"])
 def monthly_currency_summary(request, month: int, year: int):
     # Base queryset with all required filters
-    base_queryset = (
-        Transaction.objects.filter(
-            reference_date__year=year,
-            reference_date__month=month,
-        )
-        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-        .exclude(account__in=request.user.untracked_accounts.all())
-    )
+    base_queryset = Transaction.objects.filter(
+        reference_date__year=year,
+        reference_date__month=month,
+    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
 
     currency_data = calculate_currency_totals(base_queryset.all(), ignore_empty=True)
     currency_percentages = calculate_percentage_distribution(currency_data)

app/apps/net_worth/views.py

@@ -20,18 +20,17 @@ from apps.transactions.utils.calculations import (
 @require_http_methods(["GET"])
 def net_worth(request):
     if "view_type" in request.GET:
+        print(request.GET["view_type"])
         view_type = request.GET["view_type"]
         request.session["networth_view_type"] = view_type
     else:
         view_type = request.session.get("networth_view_type", "current")
 
     if view_type == "current":
-        transactions_currency_queryset = (
-            Transaction.objects.filter(is_paid=True, account__is_archived=False)
-            .order_by(
-                "account__currency__name",
-            )
-            .exclude(account__in=request.user.untracked_accounts.all())
+        transactions_currency_queryset = Transaction.objects.filter(
+            is_paid=True, account__is_archived=False
+        ).order_by(
+            "account__currency__name",
         )
         transactions_account_queryset = Transaction.objects.filter(
             is_paid=True, account__is_archived=False
@@ -40,12 +39,10 @@ def net_worth(request):
             "account__name",
         )
     else:
-        transactions_currency_queryset = (
-            Transaction.objects.filter(account__is_archived=False)
-            .order_by(
-                "account__currency__name",
-            )
-            .exclude(account__in=request.user.untracked_accounts.all())
+        transactions_currency_queryset = Transaction.objects.filter(
+            account__is_archived=False
+        ).order_by(
+            "account__currency__name",
         )
         transactions_account_queryset = Transaction.objects.filter(
             account__is_archived=False

app/apps/transactions/filters.py

@@ -60,20 +60,26 @@ class TransactionsFilter(django_filters.FilterSet):
         label=_("Currencies"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
     )
-    category = django_filters.MultipleChoiceFilter(
+    category = django_filters.ModelMultipleChoiceFilter(
+        field_name="category__name",
+        queryset=TransactionCategory.objects.all(),
+        to_field_name="name",
         label=_("Categories"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
-        method="filter_category",
     )
-    tags = django_filters.MultipleChoiceFilter(
+    tags = django_filters.ModelMultipleChoiceFilter(
+        field_name="tags__name",
+        queryset=TransactionTag.objects.all(),
+        to_field_name="name",
         label=_("Tags"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
-        method="filter_tags",
     )
-    entities = django_filters.MultipleChoiceFilter(
+    entities = django_filters.ModelMultipleChoiceFilter(
+        field_name="entities__name",
+        queryset=TransactionEntity.objects.all(),
+        to_field_name="name",
         label=_("Entities"),
         widget=TomSelectMultiple(checkboxes=True, remove_button=True),
-        method="filter_entities",
     )
     is_paid = django_filters.MultipleChoiceFilter(
         choices=SITUACAO_CHOICES,
@@ -119,7 +125,6 @@ class TransactionsFilter(django_filters.FilterSet):
             "is_paid",
             "category",
             "tags",
-            "entities",
             "date_start",
             "date_end",
             "reference_date_start",
@@ -181,93 +186,6 @@ class TransactionsFilter(django_filters.FilterSet):
         self.form.fields["date_end"].widget = AirDatePickerInput()
 
         self.form.fields["account"].queryset = Account.objects.all()
-        category_choices = list(
-            TransactionCategory.objects.values_list("name", "name").order_by("name")
-        )
-        custom_choices = [
-            ("any", _("Categorized")),
-            ("uncategorized", _("Uncategorized")),
-        ]
-        self.form.fields["category"].choices = custom_choices + category_choices
-        tag_choices = list(
-            TransactionTag.objects.values_list("name", "name").order_by("name")
-        )
-        custom_tag_choices = [("any", _("Tagged")), ("untagged", _("Untagged"))]
-        self.form.fields["tags"].choices = custom_tag_choices + tag_choices
-        entity_choices = list(
-            TransactionEntity.objects.values_list("name", "name").order_by("name")
-        )
-        custom_entity_choices = [
-            ("any", _("Any entity")),
-            ("no_entity", _("No entity")),
-        ]
-        self.form.fields["entities"].choices = custom_entity_choices + entity_choices
-
-    @staticmethod
-    def filter_category(queryset, name, value):
-        if not value:
-            return queryset
-
-        value = list(value)
-
-        if "any" in value:
-            return queryset.filter(category__isnull=False)
-
-        q = Q()
-        if "uncategorized" in value:
-            q |= Q(category__isnull=True)
-            value.remove("uncategorized")
-
-        if value:
-            q |= Q(category__name__in=value)
-
-        if q.children:
-            return queryset.filter(q)
-
-        return queryset
-
-    @staticmethod
-    def filter_tags(queryset, name, value):
-        if not value:
-            return queryset
-
-        value = list(value)
-
-        if "any" in value:
-            return queryset.filter(tags__isnull=False).distinct()
-
-        q = Q()
-        if "untagged" in value:
-            q |= Q(tags__isnull=True)
-            value.remove("untagged")
-
-        if value:
-            q |= Q(tags__name__in=value)
-
-        if q.children:
-            return queryset.filter(q).distinct()
-
-        return queryset
-
-    @staticmethod
-    def filter_entities(queryset, name, value):
-        if not value:
-            return queryset
-
-        value = list(value)
-
-        if "any" in value:
-            return queryset.filter(entities__isnull=False).distinct()
-
-        q = Q()
-        if "no_entity" in value:
-            q |= Q(entities__isnull=True)
-            value.remove("no_entity")
-
-        if value:
-            q |= Q(entities__name__in=value)
-
-        if q.children:
-            return queryset.filter(q).distinct()
-
-        return queryset
+        self.form.fields["category"].queryset = TransactionCategory.objects.all()
+        self.form.fields["tags"].queryset = TransactionTag.objects.all()
+        self.form.fields["entities"].queryset = TransactionEntity.objects.all()

app/apps/transactions/forms.py

@@ -1085,6 +1085,5 @@ class RecurringTransactionForm(forms.ModelForm):
             instance.create_upcoming_transactions()
         else:
             instance.update_unpaid_transactions()
-            instance.generate_upcoming_transactions()
 
         return instance

app/apps/transactions/views/transactions.py

@@ -589,10 +589,7 @@ def transaction_all_currency_summary(request):
 
     f = TransactionsFilter(request.GET, queryset=transactions)
 
-    currency_data = calculate_currency_totals(
-        f.qs.exclude(account__in=request.user.untracked_accounts.all()),
-        ignore_empty=True,
-    )
+    currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True)
     currency_percentages = calculate_percentage_distribution(currency_data)
 
     context = {

app/apps/users/forms.py

@@ -89,8 +89,6 @@ class UserSettingsForm(forms.ModelForm):
         ("AA", _("Default")),
         ("DC", "1.234,50"),
         ("CD", "1,234.50"),
-        ("SD", "1 234.50"),
-        ("SC", "1 234,50"),
     ]
 
     date_format = forms.ChoiceField(

app/apps/users/urls.py

@@ -4,6 +4,7 @@ from . import views
 
 urlpatterns = [
     path("", views.index, name="index"),
+    path("setup/", views.setup, name="setup"),
     path("login/", views.UserLoginView.as_view(), name="login"),
     # path("login/fallback/", views.UserLoginView.as_view(), name="fallback_login"),
     path("logout/", views.logout_view, name="logout"),
@@ -17,11 +18,6 @@ urlpatterns = [
         views.toggle_sound_playing,
         name="toggle_sound_playing",
     ),
-    path(
-        "user/toggle-sidebar/",
-        views.toggle_sidebar_status,
-        name="toggle_sidebar_status",
-    ),
     path(
         "user/settings/",
         views.update_settings,

app/apps/users/views.py

@@ -21,6 +21,8 @@ from apps.users.forms import (
 )
 from apps.users.models import UserSettings
 from apps.common.decorators.demo import disabled_on_demo
+from apps.currencies.models import Currency
+from apps.accounts.models import Account
 
 
 def logout_view(request):
@@ -48,6 +50,28 @@ def index(request):
         return redirect(reverse("monthly_index"))
 
 
+@login_required
+def setup(request):
+    has_currency = Currency.objects.exists()
+    has_account = Account.objects.exists()
+    # return render(
+    #     request,
+    #     "users/setup/setup.html",
+    #     {"has_currency": has_currency, "has_account": has_account},
+    # )
+    if not has_currency or not has_account:
+        return render(
+            request,
+            "users/setup/setup.html",
+            {"has_currency": has_currency, "has_account": has_account},
+        )
+    else:
+        return HttpResponse(
+            status=200,
+            headers={"HX-Reswap": "delete"},
+        )
+
+
 class UserLoginView(LoginView):
     form_class = LoginForm
     template_name = "users/login.html"
@@ -116,24 +140,6 @@ def update_settings(request):
     return render(request, "users/fragments/user_settings.html", {"form": form})
 
 
-@only_htmx
-@htmx_login_required
-def toggle_sidebar_status(request):
-    if not request.session.get("sidebar_status"):
-        request.session["sidebar_status"] = "floating"
-
-    if request.session["sidebar_status"] == "floating":
-        request.session["sidebar_status"] = "fixed"
-    elif request.session["sidebar_status"] == "fixed":
-        request.session["sidebar_status"] = "floating"
-    else:
-        request.session["sidebar_status"] = "fixed"
-
-    return HttpResponse(
-        status=204,
-    )
-
-
 @htmx_login_required
 @is_superuser
 @require_http_methods(["GET"])

app/apps/yearly_overview/views.py

@@ -95,7 +95,6 @@ def yearly_overview_by_currency(request, year: int):
     transactions = (
         Transaction.objects.filter(**filter_params)
         .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-        .exclude(account__in=request.user.untracked_accounts.all())
         .order_by("account__currency__name")
     )
 

app/templates/accounts/fragments/list.html

@@ -71,17 +71,6 @@
                  hx-get="{% url 'account_share_settings' pk=account.id %}">
                 <i class="fa-solid fa-share fa-fw"></i></a>
                 {% endif %}
-                <a class="btn btn-secondary btn-sm"
-                   role="button"
-                   hx-get="{% url 'account_toggle_untracked' pk=account.id %}"
-                   data-bs-toggle="tooltip"
-                   data-bs-title="{% if account.is_untracked_by %}{% translate "Track" %}{% else %}{% translate "Untrack" %}{% endif %}">
-                  {% if account.is_untracked_by %}
-                    <i class="fa-solid fa-eye fa-fw"></i>
-                  {% else %}
-                    <i class="fa-solid fa-eye-slash fa-fw"></i>
-                  {% endif %}
-                </a>
               </div>
             </td>
             <td class="col">{{ account.name }}</td>

app/templates/common/fragments/month_year_picker.html

@@ -5,51 +5,47 @@
 {% block title %}{% translate 'Pick a month' %}{% endblock %}
 
 {% block body %}
-  {% regroup month_year_data by year as years_list %}
+{% regroup month_year_data by year as years_list %}
 
-  <ul class="nav nav-pills nav-fill" id="yearTabs" role="tablist">
-    {% for x in years_list %}
-      <li class="nav-item" role="presentation">
-        <button class="nav-link{% if x.grouper == current_year %} active{% endif %}"
-                id="{{ x.grouper }}"
-                data-bs-toggle="tab"
-                data-bs-target="#{{ x.grouper }}-pane"
-                type="button"
-                role="tab"
-                aria-controls="{{ x.grouper }}-pane"
-                aria-selected="{% if x.grouper == current_year %}true{% else %}false{% endif %}">
-          {{ x.grouper }}
-        </button>
-      </li>
-    {% endfor %}
-  </ul>
-  <div class="tab-content" id="yearTabsContent" hx-boost="true">
-    {% for x in years_list %}
-      <div class="tab-pane fade{% if x.grouper == current_year %} show active{% endif %} mt-2"
-           id="{{ x.grouper }}-pane"
-           role="tabpanel"
-           aria-labelledby="{{ x.grouper }}"
-           tabindex="0">
-        <ul class="list-group list-group-flush" id="month-year-list">
-          {% for month_data in x.list %}
-            <li class="list-group-item tw:hover:bg-zinc-900
+<ul class="nav nav-pills nav-fill" id="yearTabs" role="tablist">
+  {% for x in years_list %}
+  <li class="nav-item" role="presentation">
+    <button class="nav-link{% if x.grouper == current_year %} active{% endif %}"
+            id="{{ x.grouper }}"
+            data-bs-toggle="tab"
+            data-bs-target="#{{ x.grouper }}-pane"
+            type="button"
+            role="tab"
+            aria-controls="{{ x.grouper }}-pane"
+            aria-selected="{% if x.grouper == current_year %}true{% else %}false{% endif %}">
+      {{ x.grouper }}
+    </button>
+  </li>
+  {% endfor %}
+</ul>
+<div class="tab-content" id="yearTabsContent" hx-boost="true">
+  {% for x in years_list %}
+  <div class="tab-pane fade{% if x.grouper == current_year %} show active{% endif %} mt-2"
+       id="{{ x.grouper }}-pane"
+       role="tabpanel"
+       aria-labelledby="{{ x.grouper }}"
+       tabindex="0">
+    <ul class="list-group list-group-flush" id="month-year-list">
+      {% for month_data in x.list %}
+      <li class="list-group-item tw:hover:bg-zinc-900
             {% if month_data.month == current_month and month_data.year == current_year %} disabled bg-primary{% endif %}"
-                {% if month_data.month == current_month and month_data.year == current_year %}aria-disabled="true"{% endif %}>
-              <div class="d-flex justify-content-between">
-                <a class="text-decoration-none stretched-link {% if month_data.month == current_month and month_data.year == current_year %} text-black{% endif %}"
-                   href={{ month_data.url }}>
-                  {{ month_data.month|month_name }}</a>
-                <span class="badge text-bg-secondary">{{ month_data.transaction_count }}</span>
-              </div>
-
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endfor %}
-  </div>
-  <hr>
-  <div class="w-full text-end">
-    <a class="btn btn-outline-primary btn-sm" href="{{ today_url }}" role="button" hx-boost="true">{% trans 'Today' %}</a>
+          {% if month_data.month == current_month and month_data.year == current_year %}aria-disabled="true"{% endif %}>
+        <div class="d-flex justify-content-between">
+          <a class="text-decoration-none stretched-link {% if month_data.month == current_month and month_data.year == current_year %} text-black{% endif %}"
+           href={{ month_data.url }}>
+            {{ month_data.month|month_name }}</a>
+          <span class="badge text-bg-secondary">{{ month_data.transaction_count }}</span>
+        </div>
+          
+      </li>
+      {% endfor %}
+    </ul>
   </div>
+  {% endfor %}
+</div>
 {% endblock %}

app/templates/common/placeholder.html

@@ -1,3 +0,0 @@
-{#This is here so we can add dynamic Tailwind classes that will be required via JS/hyperscript but Tailwind has no knowledge of#}
-<div class="tw:lg:w-[15vw]"></div>
-<div class="tw:lg:ml-[16vw]"></div>

app/templates/cotton/components/sidebar_menu_header.html

@@ -1,6 +1,6 @@
 <li>
   <div class="d-flex align-items-center">
-    <span class="sidebar-menu-header text-muted small fw-bold text-uppercase me-2">{{ title }}</span>
+    <span class="text-muted small fw-bold text-uppercase tw:lg:hidden tw:lg:group-hover:inline me-2">{{ title }}</span>
     <hr class="flex-grow-1"/>
   </div>
 </li>

app/templates/cotton/components/sidebar_menu_item.html

@@ -1,7 +1,7 @@
 {% load active_link %}
 <li>
   <a href="{% url url %}"
-     class="tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views=active css_class="sidebar-active" %}"
+     class="tw:text-wrap tw:lg:text-nowrap tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views=active css_class="sidebar-active" %}"
       {% if tooltip %}
      data-bs-placement="right"
      data-bs-toggle="tooltip"
@@ -9,6 +9,6 @@
       {% endif %}>
     <i class="{{ icon }} fa-fw"></i>
     <span
-        class="ms-3 fw-medium tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}</span>
+        class="ms-3 fw-medium tw:lg:invisible tw:lg:group-hover:visible tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}</span>
   </a>
 </li>

app/templates/cotton/components/sidebar_menu_url_item.html

@@ -2,7 +2,7 @@
 <li>
   <a href="{{ url }}"
      hx-boost="false"
-     class="tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views=active css_class="sidebar-active" %}"
+     class="tw:text-wrap tw:lg:text-nowrap tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views=active css_class="sidebar-active" %}"
       {% if tooltip %}
      data-bs-placement="right"
      data-bs-toggle="tooltip"
@@ -11,6 +11,6 @@
 
     <i class="{{ icon }} fa-fw"></i>
     <span
-        class="ms-3 fw-medium tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}</span>
+        class="ms-3 fw-medium tw:lg:invisible tw:lg:group-hover:visible tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}</span>
   </a>
 </li>

app/templates/cotton/transaction/item.html

@@ -33,7 +33,7 @@
             </div>
           {% endif %}
         </div>
-        <div class="col-lg col-12 {% if transaction.account.is_untracked_by or transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
+        <div class="col-lg col-12 {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
           {#      Date#}
           <div class="row mb-2 mb-lg-1 tw:text-gray-400">
             <div class="col-auto pe-1"><i class="fa-solid fa-calendar fa-fw me-1 fa-xs"></i></div>
@@ -91,7 +91,7 @@
             {% endwith %}
           </div>
         </div>
-        <div class="col-lg-auto col-12 text-lg-end align-self-end {% if transaction.account.is_untracked_by or transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
+        <div class="col-lg-auto col-12 text-lg-end align-self-end {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
           <div class="main-amount mb-2 mb-lg-0">
             <c-amount.display
                 :amount="transaction.amount"
@@ -120,8 +120,8 @@
         <div>
           {#      Item actions#}
           <div
-              class="transaction-actions tw:absolute! tw:left-1/2 tw:top-0 tw:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible tw:group-hover/transaction:visible d-flex flex-row card">
-            <div class="card-body p-1 shadow-lg d-flex flex-row gap-1">
+              class="transaction-actions tw:absolute! tw:right-[15px] tw:top-[50%] tw:md:right-auto tw:md:left-1/2 tw:md:top-0 tw:md:-translate-x-1/2 tw:-translate-y-1/2 tw:invisible tw:group-hover/transaction:visible d-flex flex-row card">
+            <div class="card-body p-1 shadow-lg d-flex flex-column flex-md-row gap-1">
               {% if not transaction.deleted %}
                 <a class="btn btn-secondary btn-sm transaction-action"
                    role="button"
@@ -146,26 +146,16 @@
                   <i class="fa-solid fa-ellipsis fa-fw"></i>
                 </button>
                 <ul class="dropdown-menu dropdown-menu-end dropdown-menu-md-start">
-                  {% if transaction.account.is_untracked_by %}
-                    <li>
-                      <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
-                        <i class="fa-solid fa-eye fa-fw me-2"></i>
-                        <div>
-                          {% translate 'Show on summaries' %}
-                          <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by account' %}</div>
-                        </div>
-                      </a>
-                    </li>
-                  {% elif transaction.category.mute %}
-                    <li>
-                      <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
-                        <i class="fa-solid fa-eye fa-fw me-2"></i>
-                        <div>
-                          {% translate 'Show on summaries' %}
-                          <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
-                        </div>
-                      </a>
-                    </li>
+                  {% if transaction.category.mute %}
+                  <li>
+                    <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
+                      <i class="fa-solid fa-eye fa-fw me-2"></i>
+                      <div>
+                        {% translate 'Show on summaries' %}
+                        <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
+                      </div>
+                    </a>
+                  </li>
                   {% elif transaction.mute %}
                     <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_mute' transaction_id=transaction.id %}" hx-target="closest .transaction" hx-swap="outerHTML"><i class="fa-solid fa-eye fa-fw me-2"></i>{% translate 'Show on summaries' %}</a></li>
                   {% else %}

app/templates/export_app/fragments/export.html

@@ -6,7 +6,7 @@
 
 {% block body %}
   <div class="container p-3">
-    <form hx-post="{% url 'export_form' %}" hx-ext="htmx-download" hx-swap="none" id="export-form" class="show-loading px-1" target="_blank">
+    <form method="post" action="{% url 'export_form' %}" id="export-form" class="show-loading px-1" _="on submit trigger hide_offcanvas" target="_blank">
       {% crispy form %}
     </form>
   </div>

app/templates/includes/scripts/hyperscript/tooltip.html

@@ -11,7 +11,7 @@ init
 end
 
 on htmx:afterSettle
-  call initTooltips(body)
+  call initTooltips(event.detail.target)
 end
   
 on tooltips

app/templates/includes/sidebar.html

@@ -5,56 +5,31 @@
 {% load static %}
 
 <div
-    class="sidebar {% if request.session.sidebar_status == 'floating' %}tw:group sidebar-floating{% elif request.session.sidebar_status == 'fixed' %}sidebar-fixed{% else %}tw:group sidebar-floating{% endif %}"
-    id="sidebar-container">
+    class="tw:group tw:lg:w-16 tw:lg:hover:w-112 tw:transition-all tw:duration-100 tw:fixed tw:top-0 tw:start-0 tw:h-full tw:z-1020">
   <nav
       id="sidebar"
       hx-boost="true"
       data-bs-scroll="true"
-      class="offcanvas-lg offcanvas-start d-lg-flex flex-column position-fixed top-0 start-0 h-100 bg-body-tertiary shadow-sm tw:z-1020">
+      class="offcanvas-lg offcanvas-start d-lg-flex flex-column position-fixed top-0 start-0 h-100 bg-body-tertiary shadow-sm tw:z-1020 tw:lg:w-16 tw:lg:group-hover:w-104 tw:transition-all tw:duration-100 tw:overflow-hidden">
+    <div
+        class="tw:hidden tw:lg:group-hover:block tw:absolute tw:top-0 tw:left-104 tw:w-8 tw:h-full tw:bg-transparent tw:pointer-events-auto tw:z-10"></div>
 
-{#    <div>#}
-{#      <a href="{% url 'index' %}" class="d-none d-lg-flex tw:justify-start p-3 text-decoration-none sidebar-title">#}
-{#        <img src="{% static 'img/logo-icon.svg' %}" alt="WYGIWYH Logo" height="30" width="30" title="WYGIWYH"/>#}
-{#        <span class="fs-4 fw-bold ms-3">WYGIWYH</span>#}
-{#      </a>#}
-{##}
-{##}
-{#    </div>#}
-
-    <div class="d-none d-lg-flex tw:justify-between tw:items-center tw:border-b tw:border-gray-600 tw:lg:flex">
-      <a href="{% url 'index' %}" class="m-0 d-none d-lg-flex tw:justify-start p-3 text-decoration-none sidebar-title">
-        <img src="{% static 'img/logo-icon.svg' %}" alt="WYGIWYH Logo" height="30" width="30" title="WYGIWYH"/>
-        <span class="fs-4 fw-bold ms-3">WYGIWYH</span>
-      </a>
-
-      <button
-          id="sidebar-toggle-btn"
-          class="text-secondary-emphasis tw:rounded-full tw:w-12 tw:h-12 tw:flex tw:items-center tw:justify-center tw:transition-all tw:duration-300"
-          hx-get="{% url 'toggle_sidebar_status' %}"
-          _="on click
-           toggle .sidebar-floating on #sidebar-container
-           toggle .tw\:group on #sidebar-container
-           toggle .sidebar-fixed on #sidebar-container
-        end
-      "
-      >
-        <i class="fa-solid fa-thumbtack fa-sm"></i>
-        <i class="fa-solid fa-thumbtack-slash fa-sm"></i>
-      </button>
-    </div>
+    <a href="{% url 'index' %}" class="d-none d-lg-flex tw:justify-start p-3 text-decoration-none">
+      <img src="{% static 'img/logo-icon.svg' %}" alt="WYGIWYH Logo" height="30" width="30" title="WYGIWYH"/>
+      <span class="fs-4 fw-bold ms-3 tw:lg:invisible tw:lg:group-hover:visible">WYGIWYH</span>
+    </a>
 
     <div class="offcanvas-header">
       <a href="{% url 'index' %}" class="offcanvas-title d-flex tw:justify-start text-decoration-none">
         <img src="{% static 'img/logo-icon.svg' %}" alt="WYGIWYH Logo" height="30" width="30" title="WYGIWYH"/>
-        <span class="fs-4 fw-bold ms-3">WYGIWYH</span>
+        <span class="fs-4 fw-bold ms-3 tw:lg:invisible tw:lg:group-hover:visible">WYGIWYH</span>
       </a>
       <button type="button" class="btn-close" data-bs-target="#sidebar" data-bs-dismiss="offcanvas"
               aria-label={% translate 'Close' %}></button>
     </div>
     <hr class="m-0">
 
-    <ul class="list-unstyled p-3 d-flex flex-column gap-0 tw:text-nowrap tw:lg:group-hover:animate-[disable-pointer-events]"
+    <ul class="list-unstyled p-3 d-flex flex-column gap-0 tw:group-hover:lg:overflow-y-auto tw:lg:overflow-y-hidden tw:overflow-y-auto tw:overflow-x-hidden tw:text-nowrap tw:lg:group-hover:animate-[disable-pointer-events]"
         style="animation-duration: 100ms">
 
       <c-components.sidebar-menu-item
@@ -152,10 +127,10 @@
            data-bs-target="#collapsible-panel"
            aria-expanded="false"
            aria-controls="collapsible-panel"
-           class="sidebar-menu-item tw:text-wrap tw:lg:text-nowrap tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' css_class="sidebar-active" %}">
+           class="tw:text-wrap tw:lg:text-nowrap tw:lg:text-sm d-flex align-items-center text-decoration-none p-2 rounded-3 sidebar-item {% active_link views='tags_index||entities_index||categories_index||accounts_index||account_groups_index||currencies_index||exchange_rates_index||rules_index||import_profiles_index||automatic_exchange_rates_index||export_index||users_index' css_class="sidebar-active" %}">
         <i class="fa-solid fa-toolbox fa-fw"></i>
         <span
-            class="ms-3 fw-medium tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">
+            class="ms-3 fw-medium tw:lg:invisible tw:lg:group-hover:visible tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">
         {% translate 'Management' %}
       </span>
       </div>
@@ -163,15 +138,16 @@
 
     <div class="mt-auto p-2 w-100">
       <div id="collapsible-panel"
-           class="p-0 collapse tw:absolute tw:bottom-0 tw:left-0 tw:w-full tw:z-30 tw:max-h-dvh">
-        <div class="tw:h-dvh tw:backdrop-blur-3xl tw:flex tw:flex-col">
+           class="p-0 collapse tw:absolute tw:bottom-0 tw:left-0 tw:w-full tw:z-30 tw:group-hover:lg:overflow-y-auto tw:lg:overflow-y-hidden tw:max-h-dvh">
+        <div class="tw:h-dvh tw:backdrop-blur-3xl">
+          <!-- Header -->
           <div
-              class="tw:justify-between tw:items-center tw:p-4 tw:border-b tw:border-gray-600 sidebar-submenu-header">
-            <h5 class="tw:text-lg tw:font-semibold tw:text-gray-800 m-0">
+              class="tw:flex tw:justify-between tw:items-center tw:p-4 tw:border-b tw:border-gray-600 tw:lg:hidden tw:lg:group-hover:flex">
+            <h5 class="tw:text-lg tw:font-semibold tw:text-gray-800 tw:lg:invisible tw:lg:group-hover:visible">
               {% trans 'Management' %}
             </h5>
 
-            <button type="button" class="btn-close" aria-label="Close"
+            <button type="button" class="btn-close tw:lg:hidden tw:lg:group-hover:inline" aria-label="Close"
                     data-bs-toggle="collapse"
                     data-bs-target="#collapsible-panel"
                     aria-expanded="true"
@@ -179,7 +155,7 @@
             </button>
           </div>
 
-          <ul class="list-unstyled p-3 d-flex flex-column gap-1 tw:lg:group-hover:animate-[disable-pointer-events] tw:flex-1"
+          <ul class="list-unstyled p-3 d-flex flex-column gap-1 tw:group-hover:lg:overflow-y-auto tw:lg:overflow-y-hidden tw:overflow-y-auto tw:overflow-x-hidden tw:text-nowrap tw:lg:group-hover:animate-[disable-pointer-events]"
               style="animation-duration: 100ms">
             <c-components.sidebar-menu-header title="{% translate 'Transactions' %}"></c-components.sidebar-menu-header>
             <c-components.sidebar-menu-item
@@ -285,7 +261,7 @@
         </div>
       {% endif %}
 
-      <div class="btn-group w-100 sidebar-item" role="group">
+      <div class="btn-group w-100" role="group">
         <button type="button" class="btn btn-secondary btn-sm" data-bs-toggle="tooltip"
                 data-bs-title="{% trans "Calculator" %}"
                 _="on click trigger show on #calculator">
@@ -297,24 +273,17 @@
     <div>
       <hr class="my-1">
       <div
-          class="ps-4 pe-2 py-2 d-flex align-items-center text-decoration-none justify-content-between">
-
-        <div class="d-flex align-items-center" style="min-width: 0;">
-          <i class="fa-solid fa-circle-user text-body-secondary"></i>
-
-          <strong class="mx-2 text-body-secondary text-truncate sidebar-invisible">
-            {{ user.email }}
-          </strong>
+          class="ps-4 pe-2 py-2 d-flex align-items-center text-body-secondary text-decoration-none justify-content-between tw:text-wrap tw:lg:text-nowrap">
+        <div>
+          <i class="fa-solid fa-circle-user"></i>
+          <strong class="ms-2 tw:lg:invisible tw:lg:group-hover:visible">{{ user.email }}</strong>
         </div>
-
-        <div class="sidebar-invisible">
+        <div class="tw:lg:invisible tw:lg:group-hover:visible">
           {% include 'includes/navbar/user_menu.html' %}
         </div>
-
       </div>
     </div>
   </nav>
-
   <div
       class="tw:hidden tw:lg:group-hover:block tw:absolute tw:top-0 tw:left-104 tw:w-16 tw:h-full tw:bg-transparent"></div>
 </div>

app/templates/insights/fragments/category_overview/index.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div hx-get="{% url 'category_overview' %}" hx-trigger="updated from:window" class="show-loading" hx-swap="outerHTML"
-     hx-include="#picker-form, #picker-type, #view-type, #show-tags, #showing, #show-entities">
+     hx-include="#picker-form, #picker-type, #view-type, #show-tags, #showing">
   <div class="h-100 text-center mb-4">
     <div class="btn-group gap-3" role="group" id="view-type" _="on change trigger updated">
       <input type="radio" class="btn-check"
@@ -25,34 +25,19 @@
     </div>
   </div>
   <div class="mt-3 mb-1 d-flex flex-column flex-md-row justify-content-between">
-    <div class="d-flex gap-4">
+    <div class="form-check form-switch" id="show-tags">
       {% if view_type == 'table' %}
-        <div class="form-check form-switch" id="show-tags">
-          <input type="hidden" name="show_tags" value="off">
-          <input class="form-check-input" type="checkbox" role="switch" id="show-tags-switch" name="show_tags"
-                 _="on change trigger updated" {% if show_tags %}checked{% endif %}>
-          {% spaceless %}
-            <label class="form-check-label" for="show-tags-switch">
-              {% trans 'Tags' %}
-            </label>
-            <c-ui.help-icon
-                content="{% trans 'Transaction amounts associated with multiple tags will be counted once for each tag' %}"
-                icon="fa-solid fa-circle-exclamation"></c-ui.help-icon>
-          {% endspaceless %}
-        </div>
-        <div class="form-check form-switch" id="show-entities" {% if not show_tags %}style="display: none;"{% endif %}>
-          <input type="hidden" name="show_entities" value="off">
-          <input class="form-check-input" type="checkbox" role="switch" id="show-entities-switch" name="show_entities"
-                 _="on change trigger updated" {% if show_entities %}checked{% endif %}>
-          {% spaceless %}
-            <label class="form-check-label" for="show-entities-switch">
-              {% trans 'Entities' %}
-            </label>
-            <c-ui.help-icon
-                content="{% trans 'Transaction amounts associated with multiple tags and entities will be counted once for each tag' %}"
-                icon="fa-solid fa-circle-exclamation"></c-ui.help-icon>
-          {% endspaceless %}
-        </div>
+        <input type="hidden" name="show_tags" value="off">
+        <input class="form-check-input" type="checkbox" role="switch" id="show-tags-switch" name="show_tags"
+               _="on change trigger updated" {% if show_tags %}checked{% endif %}>
+        {% spaceless %}
+          <label class="form-check-label" for="show-tags-switch">
+            {% trans 'Tags' %}
+          </label>
+          <c-ui.help-icon
+              content="{% trans 'Transaction amounts associated with multiple tags will be counted once for each tag' %}"
+              icon="fa-solid fa-circle-exclamation"></c-ui.help-icon>
+        {% endspaceless %}
       {% endif %}
     </div>
     <div class="btn-group btn-group-sm" role="group" id="showing" _="on change trigger updated">
@@ -265,100 +250,6 @@
                       {% endfor %}
                     </td>
                   </tr>
-                  <!-- Entity rows -->
-                  {% if show_entities %}
-                    {% for entity_id, entity in tag.entities.items %}
-                      <tr class="table-row-nested-2">
-                        <td class="ps-5">
-                          <i class="fa-solid fa-user-group fa-fw me-2 text-muted"></i>{{ entity.name }}
-                        </td>
-                        <td>
-                          {% for currency in entity.currencies.values %}
-                            {% if showing == 'current' and currency.income_current != 0 %}
-                              <c-amount.display
-                                  :amount="currency.income_current"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="green"></c-amount.display>
-                            {% elif showing == 'projected' and currency.income_projected != 0 %}
-                              <c-amount.display
-                                  :amount="currency.income_projected"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="green"></c-amount.display>
-                            {% elif showing == 'final' and currency.total_income != 0 %}
-                              <c-amount.display
-                                  :amount="currency.total_income"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="green"></c-amount.display>
-                            {% else %}
-                              <div>-</div>
-                            {% endif %}
-                          {% endfor %}
-                        </td>
-                        <td>
-                          {% for currency in entity.currencies.values %}
-                            {% if showing == 'current' and currency.expense_current != 0 %}
-                              <c-amount.display
-                                  :amount="currency.expense_current"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="red"></c-amount.display>
-                            {% elif showing == 'projected' and currency.expense_projected != 0 %}
-                              <c-amount.display
-                                  :amount="currency.expense_projected"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="red"></c-amount.display>
-                            {% elif showing == 'final' and currency.total_expense != 0 %}
-                              <c-amount.display
-                                  :amount="currency.total_expense"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="red"></c-amount.display>
-                            {% else %}
-                              <div>-</div>
-                            {% endif %}
-                          {% endfor %}
-                        </td>
-                        <td>
-                          {% for currency in entity.currencies.values %}
-                            {% if showing == 'current' and currency.total_current != 0 %}
-                              <c-amount.display
-                                  :amount="currency.total_current"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
-                            {% elif showing == 'projected' and currency.total_projected != 0 %}
-                              <c-amount.display
-                                  :amount="currency.total_projected"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
-                            {% elif showing == 'final' and currency.total_final != 0 %}
-                              <c-amount.display
-                                  :amount="currency.total_final"
-                                  :prefix="currency.currency.prefix"
-                                  :suffix="currency.currency.suffix"
-                                  :decimal_places="currency.currency.decimal_places"
-                                  color="{% if currency.total_final < 0 %}red{% else %}green{% endif %}"></c-amount.display>
-                            {% else %}
-                              <div>-</div>
-                            {% endif %}
-                          {% endfor %}
-                        </td>
-                      </tr>
-                    {% endfor %}
-                  {% endif %}
                 {% endif %}
               {% endfor %}
             {% endif %}

app/templates/layouts/base.html

@@ -35,7 +35,7 @@
   {% include 'includes/mobile_navbar.html' %}
   {% include 'includes/sidebar.html' %}
 
-  <main class="tw:p-4">
+  <main class="tw:p-4 tw:lg:ml-16">
     {% settings "DEMO" as demo_mode %}
     {% if demo_mode %}
     <div class="px-3 m-0" id="demo-mode-alert" hx-preserve>
@@ -46,6 +46,8 @@
     </div>
     {% endif %}
 
+    <div class="container" hx-get="{% url 'setup' %}" hx-trigger="load, updated from:window"></div>
+
     <div id="content">
       {% block content %}{% endblock %}
     </div>

app/templates/monthly_overview/pages/overview.html

@@ -44,12 +44,12 @@
         </div>
       </div>
       {#    Action buttons#}
-      {#      <div class="col-12 col-xl-8">#}
-      {#        <c-ui.quick-transactions-buttons#}
-      {#            :year="year"#}
-      {#            :month="month"#}
-      {#        ></c-ui.quick-transactions-buttons>#}
-      {#      </div>#}
+{#      <div class="col-12 col-xl-8">#}
+{#        <c-ui.quick-transactions-buttons#}
+{#            :year="year"#}
+{#            :month="month"#}
+{#        ></c-ui.quick-transactions-buttons>#}
+{#      </div>#}
     </div>
     {#  Monthly summary#}
     <div class="row gx-xl-4 gy-3">
@@ -133,102 +133,60 @@
 
       </div>
       <div class="col-12 col-xl-8 order-2 order-xl-1">
-
-        <div class="my-3">
-          {# Hidden select to hold the order value and preserve the original update trigger #}
-          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
-            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-          </select>
-
-          {# Main control bar with filter, search, and ordering #}
-          <div class="input-group">
-
-            <button class="btn btn-secondary position-relative" type="button"
-                    data-bs-toggle="collapse" data-bs-target="#collapse-filter"
-                    aria-expanded="false" aria-controls="collapse-filter" id="filter-button" hx-preserve
-                    title="{% translate 'Filter transactions' %}">
-              <i class="fa-solid fa-filter fa-fw"></i>
+        <div class="row mb-1">
+          <div class="col-sm-6 col-12">
+            {#        Filter transactions button #}
+            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
+                    aria-controls="collapse-filter">
+              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
             </button>
-
-            {# Search box #}
-            <label for="quick-search">
-            </label>
-            <input type="search"
-                   class="form-control"
-                   placeholder="{% translate 'Search' %}"
-                   hx-preserve
-                   id="quick-search"
-                   _="on input or search or htmx:afterSwap from window
-                         if my value is empty
-                           trigger toggle on <.transactions-divider-collapse/>
-                         else
-                           trigger show on <.transactions-divider-collapse/>
-                         end
-                         show <.transactions-divider-title/> when my value is empty
-                         show <.transaction/> in <#transactions-list/>
-                         when its textContent.toLowerCase() contains my value.toLowerCase()">
-
-            {# Order by icon dropdown #}
-            <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
-                    data-bs-toggle="dropdown" aria-expanded="false"
-                    title="{% translate 'Order by' %}">
-              <i class="fa-solid fa-sort fa-fw"></i>
-            </button>
-            <ul class="dropdown-menu dropdown-menu-end">
-              <li>
-                <button class="dropdown-item {% if order == 'default' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'default'
-                           then trigger change on #order">
-                  {% translate 'Default' %}
-                </button>
-              </li>
-              <li>
-                <button class="dropdown-item {% if order == 'older' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'older'
-                           then trigger change on #order">
-                  {% translate 'Oldest first' %}
-                </button>
-              </li>
-              <li>
-                <button class="dropdown-item {% if order == 'newer' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'newer'
-                           then trigger change on #order">
-                  {% translate 'Newest first' %}
-                </button>
-              </li>
-            </ul>
           </div>
-
-          {# Filter transactions form #}
-          <div class="collapse" id="collapse-filter" hx-preserve>
-            <div class="card card-body">
-              <div class="text-end">
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-              </div>
-
-              <form _="on change or submit or search trigger updated on window
-                         install init_tom_select
-                         install init_datepicker"
-                    id="filter" class="mt-3">
-                {% crispy filter.form %}
-              </form>
-
-              <div class="text-end">
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-              </div>
+          {#        Ordering button#}
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
+            <div class="text-sm-end" _="on change trigger updated on window">
+              <label for="order">{% translate "Order by" %}</label>
+              <select
+                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
+                  name="order" id="order">
+                <option value="default"
+                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+                <option value="older"
+                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+                <option value="newer"
+                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+              </select>
             </div>
           </div>
         </div>
+        {#      Filter transactions form#}
+        <div class="collapse" id="collapse-filter" hx-preserve>
+          <div class="card card-body">
+            <form _="on change or submit or search trigger updated on window end
+                   install init_tom_select
+                   install init_datepicker"
+                  id="filter">
+              {% crispy filter.form %}
+            </form>
+            <button class="btn btn-outline-danger btn-sm"
+                    _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+          </div>
+        </div>
+        <div id="search" class="my-3">
+          <label class="w-100">
+            <input type="search" class="form-control" placeholder="{% translate 'Search' %}" hx-preserve
+                   id="quick-search"
+                   _="on input or search or htmx:afterSwap from window
+                      if my value is empty
+                        trigger toggle on <.transactions-divider-collapse/>
+                      else
+                        trigger show on <.transactions-divider-collapse/>
+                      end
+                      show <.transactions-divider-title/> when my value is empty
+                      show <.transaction/> in <#transactions-list/>
+                      when its textContent.toLowerCase() contains my value.toLowerCase()">
+          </label>
+        </div>
         {#      Transactions list#}
         <div id="transactions"
              class="show-loading"

app/templates/transactions/fragments/list_all.html

@@ -5,128 +5,121 @@
 
 <div id="transactions-list">
   {% for x in transactions_by_date %}
-    <div id="{{ x.grouper|slugify }}" class="transactions-divider"
-         _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body transactions-divider-title">
+    <div id="{{ x.grouper|slugify }}"
+         _="on htmx:afterSettle from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"
            data-bs-target="#c-{{ x.grouper|slugify }}-collapse"
            id="c-{{ x.grouper|slugify }}-collapsible"
-           aria-expanded="false"
+           aria-expanded="true"
            aria-controls="c-{{ x.grouper|slugify }}-collapse">
         {{ x.grouper }}
         </a>
       </div>
-      <div class="collapse transactions-divider-collapse" id="c-{{ x.grouper|slugify }}-collapse"
+      <div class="collapse" id="c-{{ x.grouper|slugify }}-collapse"
            _="on shown.bs.collapse sessionStorage.setItem(the closest parent @id, 'true')
               on hidden.bs.collapse sessionStorage.setItem(the closest parent @id, 'false')
-              on htmx:afterSettle from #transactions or toggle
+              on htmx:afterSettle from #transactions
                 set state to sessionStorage.getItem(the closest parent @id)
                 if state is 'true' or state is null
                   add .show to me
                   set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true
-                else
-                  remove .show from me
-                  set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to false
-                end
-              on show
-                add .show to me
-                set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true">
+                end">
         <div class="d-flex flex-column">
         {% for transaction in x.list %}
-          <c-transaction.item
-            :transaction="transaction"></c-transaction.item>
+          <c-transaction.item :transaction="transaction"></c-transaction.item>
         {% endfor %}
         </div>
       </div>
     </div>
   {% empty %}
     <c-msg.empty
-        title="{% translate "No transactions found" %}"
-        subtitle="{% translate "Try adding one" %}"></c-msg.empty>
-  {% endfor %}
+      title="{% translate "No transactions found" %}"
+      subtitle="{% translate "Try adding one" %}"></c-msg.empty>
+{% endfor %}
 
   {% if page_obj.has_other_pages %}
-    <div class="mt-auto">
-      <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
+  <div class="mt-auto">
+    <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
 
-      <nav aria-label="{% translate 'Page navigation' %}">
-        <ul class="pagination justify-content-center mt-5">
-          <li class="page-item">
-            <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
-               hx-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
-               hx-vals='{"page": 1}'
-               hx-include="#filter, #order"
-               hx-target="#transactions-list"
-               aria-label="Primeira página"
-               hx-swap="show:top">
-              <span aria-hidden="true">&laquo;</span>
-            </a>
-          </li>
-          {% for page_number in page_obj.paginator.page_range %}
-            {% comment %}
+    <nav aria-label="{% translate 'Page navigation' %}">
+    <ul class="pagination justify-content-center mt-5">
+      <li class="page-item">
+        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+           hx-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
+           hx-vals='{"page": 1}'
+           hx-include="#filter, #order"
+           hx-target="#transactions-list"
+           aria-label="Primeira página"
+           hx-swap="show:top">
+          <span aria-hidden="true">&laquo;</span>
+        </a>
+      </li>
+      {% for page_number in page_obj.paginator.page_range %}
+              {% comment %}
                   This conditional allows us to display up to 3 pages before and after the current page
                   If you decide to remove this conditional, all the pages will be displayed
 
                   You can change the 3 to any number you want e.g
                   To display only 5 pagination items, change the 3 to 2 (2 before and 2 after the current page)
               {% endcomment %}
-            {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
-              {% if page_obj.number == page_number %}
-                <li class="page-item active">
-                  <a class="page-link tw:cursor-pointer">
-                    {{ page_number }}
-                  </a>
-                </li>
-              {% else %}
-                <li class="page-item">
-                  <a class="page-link tw:cursor-pointer"
-                     hx-get="{% url 'transactions_all_list' %}"
-                     hx-vals='{"page": {{ page_number }}}'
-                     hx-include="#filter, #order"
-                     hx-target="#transactions-list"
-                     hx-swap="show:top">
-                    {{ page_number }}
-                  </a>
-                </li>
+              {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
+                  {% if page_obj.number == page_number %}
+                      <li class="page-item active">
+                          <a class="page-link tw:cursor-pointer">
+                              {{ page_number }}
+                          </a>
+                      </li>
+                  {% else %}
+                      <li class="page-item">
+                          <a class="page-link tw:cursor-pointer"
+                             hx-get="{% url 'transactions_all_list' %}"
+                             hx-vals='{"page": {{ page_number }}}'
+                             hx-include="#filter, #order"
+                             hx-target="#transactions-list"
+                             hx-swap="show:top">
+                              {{ page_number }}
+                          </a>
+                      </li>
+                  {% endif %}
               {% endif %}
-            {% endif %}
-          {% endfor %}
-          {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
-            <li class="page-item">
-              <a class="page-link disabled"
-                 aria-label="...">
-                <span aria-hidden="true">...</span>
-              </a>
-            </li>
-            <li class="page-item">
-              <a class="page-link tw:cursor-pointer"
-                 hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
-                 hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-                 hx-include="#filter, #order"
-                 hx-swap="show:top"
-                 aria-label="Última página">
-                <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
-              </a>
-            </li>
-          {% endif %}
-          <li class="page-item">
-            <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
-               hx-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
-               hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-               hx-include="#filter, #order"
-               hx-swap="show:top"
-               hx-target="#transactions-list"
-               aria-label="Next">
-              <span aria-hidden="true">&raquo;</span>
-            </a>
-          </li>
-        </ul>
-      </nav>
-    </div>
+      {% endfor %}
+      {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
+        <li class="page-item">
+          <a class="page-link disabled"
+             aria-label="...">
+            <span aria-hidden="true">...</span>
+          </a>
+        </li>
+        <li class="page-item">
+          <a class="page-link tw:cursor-pointer"
+             hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
+             hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+             hx-include="#filter, #order"
+             hx-swap="show:top"
+             aria-label="Última página">
+            <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
+          </a>
+        </li>
+      {% endif %}
+      <li class="page-item">
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
+           hx-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
+           hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+           hx-include="#filter, #order"
+           hx-swap="show:top"
+           hx-target="#transactions-list"
+           aria-label="Next">
+          <span aria-hidden="true">&raquo;</span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+  </div>
   {% endif %}
-  {#  Floating bar#}
+{#  Floating bar#}
   <c-ui.transactions-action-bar></c-ui.transactions-action-bar>
 
 </div>

app/templates/transactions/pages/transactions.html

@@ -8,101 +8,45 @@
   <div class="container px-md-3 py-3 column-gap-5">
     <div class="row gx-xl-4 gy-3">
       <div class="col-12 col-xl-8 order-2 order-xl-1">
-        <div class="mb-3">
-          {# Hidden select to hold the order value and preserve the original update trigger #}
-          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
-            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-          </select>
-
-          {# Main control bar with filter, search, and ordering #}
-          <div class="input-group">
-
-            <button class="btn btn-secondary position-relative" type="button"
-                    data-bs-toggle="collapse" data-bs-target="#collapse-filter"
-                    aria-expanded="false" aria-controls="collapse-filter" id="filter-button" hx-preserve
-                    title="{% translate 'Filter transactions' %}">
-              <i class="fa-solid fa-filter fa-fw"></i>
+        <div class="row mb-1">
+          <div class="col-sm-6 col-12">
+            {#        Filter transactions button #}
+            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
+                    aria-controls="collapse-filter">
+              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
             </button>
-
-            {# Search box #}
-            <label for="quick-search">
-            </label>
-            <input type="search"
-                   class="form-control"
-                   placeholder="{% translate 'Search' %}"
-                   hx-preserve
-                   id="quick-search"
-                   _="on input or search or htmx:afterSwap from window
-                         if my value is empty
-                           trigger toggle on <.transactions-divider-collapse/>
-                         else
-                           trigger show on <.transactions-divider-collapse/>
-                         end
-                         show <.transactions-divider-title/> when my value is empty
-                         show <.transaction/> in <#transactions-list/>
-                         when its textContent.toLowerCase() contains my value.toLowerCase()">
-
-            {# Order by icon dropdown #}
-            <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
-                    data-bs-toggle="dropdown" aria-expanded="false"
-                    title="{% translate 'Order by' %}">
-              <i class="fa-solid fa-sort fa-fw"></i>
-            </button>
-            <ul class="dropdown-menu dropdown-menu-end">
-              <li>
-                <button class="dropdown-item {% if order == 'default' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'default'
-                           then trigger change on #order">
-                  {% translate 'Default' %}
-                </button>
-              </li>
-              <li>
-                <button class="dropdown-item {% if order == 'older' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'older'
-                           then trigger change on #order">
-                  {% translate 'Oldest first' %}
-                </button>
-              </li>
-              <li>
-                <button class="dropdown-item {% if order == 'newer' %}active{% endif %}" type="button"
-                        _="on click remove .active from .dropdown-item in the closest <ul/>
-                           then add .active to me
-                           then set the value of #order to 'newer'
-                           then trigger change on #order">
-                  {% translate 'Newest first' %}
-                </button>
-              </li>
-            </ul>
           </div>
-
-          {# Filter transactions form #}
-          <div class="collapse" id="collapse-filter" hx-preserve>
-            <div class="card card-body">
-              <div class="text-end">
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-              </div>
-
-              <form _="on change or submit or search trigger updated on window
-                         install init_tom_select
-                         install init_datepicker"
-                    id="filter" class="mt-3">
-                {% crispy filter.form %}
-              </form>
-
-              <div class="text-end">
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-              </div>
+          {#        Ordering button#}
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
+            <div class="text-sm-end" _="on change trigger updated on window">
+              <label for="order">{% translate "Order by" %}</label>
+              <select
+                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
+                  name="order" id="order">
+                <option value="default"
+                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+                <option value="older"
+                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+                <option value="newer"
+                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+              </select>
             </div>
           </div>
         </div>
+        {#      Filter transactions form#}
+        <div class="collapse" id="collapse-filter">
+          <div class="card card-body">
+            <form _="on change or submit or search trigger updated on window end
+                   install init_tom_select
+                   install init_datepicker"
+                  id="filter">
+              {% crispy filter.form %}
+            </form>
+            <button class="btn btn-outline-danger btn-sm"
+                    _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+          </div>
+        </div>
         <div id="transactions"
              class="show-loading"
              hx-get="{% url 'transactions_all_list' %}"

app/templates/users/setup/setup.html

@@ -0,0 +1,68 @@
+{% load i18n %}
+<div class="card shadow-sm rounded-3">
+        <div class="card-header border-bottom-0 pt-4 px-4">
+            <h5 class="card-title fw-bold"><i class="fas fa-rocket me-2"></i>Let's Get You Set Up</h5>
+        </div>
+        <div class="card-body p-4">
+            <!-- Explanation Text -->
+            <div class="alert alert-info border-0" role="alert">
+                <div class="d-flex align-items-center">
+                    <i class="fas fa-info-circle fa-lg me-3"></i>
+                    <div>
+                        Welcome to <strong>WYGIWYH</strong>! To get started, you need to configure a currency and create your first account. This will establish the foundation for managing your finances.
+                    </div>
+                </div>
+            </div>
+
+            <!-- Task Lists -->
+            <div class="mt-4 border rounded-3 overflow-hidden">
+                <!-- Required Section -->
+                <div class="p-3 text-bg-secondary text-muted text-uppercase fw-bold small">Required Steps</div>
+                <ul class="list-group list-group-flush">
+                    <!-- Task 1: Create Currency -->
+                    <li class="list-group-item d-flex justify-content-between align-items-center p-3">
+                        <div class="d-flex align-items-center">
+                            <i class="fa-regular fa-circle{% if has_currency %}-check{% endif %} fa-fw text-primary me-3"></i>
+                            <span class="fw-medium {% if has_currency %}tw:line-through{% endif %}">{% trans 'Add' %} {% trans 'Currency' %}</span>
+                        </div>
+                        <a href="#" class="btn btn-primary btn-sm"
+                           role="button"
+                           hx-get="{% url 'currency_add' %}"
+                           hx-target="#generic-offcanvas">{% trans 'Add' %} <i class="fas fa-arrow-right ms-1"></i></a>
+                    </li>
+                    <!-- Task 2: Create Account -->
+                    <li class="list-group-item d-flex justify-content-between align-items-center p-3">
+                        <div class="d-flex align-items-center">
+                            <i class="fa-regular fa-circle{% if has_account %}-check{% endif %} fa-fw text-primary me-3"></i>
+                            <span class="fw-medium {% if has_account %}tw:line-through{% endif %}">{% trans 'Add' %} {% trans 'Account' %}</span>
+                        </div>
+                        <a class="btn btn-primary btn-sm"
+                           role="button"
+                           hx-get="{% url 'account_add' %}"
+                           hx-target="#generic-offcanvas">{% trans 'Add' %} <i class="fas fa-arrow-right ms-1"></i></a>
+                    </li>
+                </ul>
+
+                <!-- Optional Section -->
+                <div class="p-3 text-bg-secondary text-muted text-uppercase fw-bold small border-top">Optional Steps</div>
+                <ul class="list-group list-group-flush">
+                    <!-- Task 3: Import Data -->
+                    <li class="list-group-item d-flex justify-content-between align-items-center p-3">
+                        <div class="d-flex align-items-center">
+                            <i class="fas fa-upload fa-fw text-secondary me-3"></i>
+                            <span class="fw-medium">Import data from another app</span>
+                        </div>
+                        <a href="#" class="btn btn-outline-secondary btn-sm">Import</a>
+                    </li>
+                    <!-- Task 4: Invite Team -->
+                    <li class="list-group-item d-flex justify-content-between align-items-center p-3">
+                        <div class="d-flex align-items-center">
+                            <i class="fas fa-user-plus fa-fw text-secondary me-3"></i>
+                            <span class="fw-medium">Invite team members</span>
+                        </div>
+                        <a href="#" class="btn btn-outline-secondary btn-sm">Invite</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>

frontend/src/application/_htmx.js

@@ -1,66 +1,2 @@
 import htmx from "htmx.org";
-
 window.htmx = htmx;
-
-htmx.defineExtension('htmx-download', {
-    onEvent: function (name, evt) {
-
-        if (name === 'htmx:beforeRequest') {
-            // Set the responseType to 'arraybuffer' to handle binary data
-            evt.detail.xhr.responseType = 'arraybuffer';
-        }
-
-        if (name === 'htmx:beforeSwap') {
-            const xhr = evt.detail.xhr;
-
-            if (xhr.status === 200) {
-                // Parse headers
-                const headers = {};
-                const headerStr = xhr.getAllResponseHeaders();
-                const headerArr = headerStr.trim().split(/[\r\n]+/);
-                headerArr.forEach((line) => {
-                    const parts = line.split(": ");
-                    const header = parts.shift().toLowerCase();
-                    const value = parts.join(": ");
-                    headers[header] = value;
-                });
-
-                // Extract filename
-                let filename = 'downloaded_file.xlsx';
-                if (headers['content-disposition']) {
-                    const filenameMatch = headers['content-disposition'].match(/filename\*?=(?:UTF-8'')?"?([^;\n"]+)/i);
-                    if (filenameMatch && filenameMatch[1]) {
-                        filename = decodeURIComponent(filenameMatch[1].replace(/['"]/g, ''));
-                    }
-                }
-
-                // Determine MIME type
-                const mimetype = headers['content-type'] || 'application/octet-stream';
-
-                // Create Blob
-                const blob = new Blob([xhr.response], {type: mimetype});
-                const url = URL.createObjectURL(blob);
-
-                // Trigger download
-                const link = document.createElement("a");
-                link.style.display = "none";
-                link.href = url;
-                link.download = filename;
-                document.body.appendChild(link);
-                link.click();
-
-                // Cleanup
-                setTimeout(() => {
-                    URL.revokeObjectURL(url);
-                    link.remove();
-                }, 100);
-
-            } else {
-                console.warn(`[htmx-download] Unexpected response status: ${xhr.status}`);
-            }
-
-            // Prevent htmx from swapping content
-            evt.detail.shouldSwap = false;
-        }
-    },
-});

frontend/src/styles/_bootstrap.scss

@@ -49,7 +49,3 @@ $theme-colors: map.merge(
 .offcanvas-size-sm {
   --#{$prefix}offcanvas-width: min(95vw, 250px) !important;
 }
-
-.dropdown-toggle.dropdown-toggle-no-icon::after {
-  display:none;
-}

frontend/src/styles/style.scss

@@ -85,7 +85,3 @@ select[multiple] {
 [data-bs-toggle="collapse"][aria-expanded="true"] .fa-chevron-down {
   transform: rotate(-180deg);
 }
-
-div:where(.swal2-container) {
-  z-index: 1100 !important;
-}

frontend/src/styles/tailwind.css

@@ -3,139 +3,9 @@
 @custom-variant hover (&:hover);
 
 .sidebar-active {
-    @apply tw:bg-gray-700 tw:text-white;
+  @apply tw:bg-gray-700 tw:text-white;
 }
 
 .sidebar-item:not(.sidebar-active) {
     @apply tw:text-gray-300 tw:hover:text-white;
 }
-
-@layer components {
-    .sidebar {
-        @apply tw:z-1020 tw:fixed tw:top-0 tw:start-0 tw:h-full tw:transition-all tw:duration-100;
-    }
-
-    .sidebar-floating {
-        /* Establishes the hover group and sets the collapsed/hover widths for the container */
-        @apply tw:lg:w-16 tw:lg:hover:w-112;
-    }
-
-    .sidebar-floating #sidebar {
-        /* Sets the collapsed/hover widths for the inner navigation element */
-        @apply tw:lg:w-16 tw:lg:group-hover:w-104 tw:transition-all tw:duration-100 tw:overflow-hidden;
-    }
-
-    .sidebar-floating + main {
-        /* Adjusts the main content margin to account for the collapsed sidebar */
-        @apply tw:lg:ml-16 tw:transition-all tw:duration-100;
-    }
-
-    .sidebar-floating .sidebar-item span {
-        /* Hides the text labels and reveals them only on hover */
-        @apply tw:lg:invisible tw:lg:group-hover:visible;
-    }
-
-    .sidebar-floating .sidebar-invisible {
-        /* Hides the text labels and reveals them only on hover */
-        @apply tw:lg:invisible tw:lg:group-hover:visible;
-    }
-
-    .sidebar-floating .sidebar-menu-header {
-        /* Hides the menu headers and reveals them only on hover */
-        @apply tw:lg:hidden tw:lg:group-hover:inline;
-    }
-
-    .sidebar-floating #sidebar-toggle-btn .fa-thumbtack-slash {
-        /* Hides the 'pin' icon in the floating state */
-        @apply tw:hidden!;
-    }
-
-    .sidebar-floating #sidebar-toggle-btn .fa-thumbtack {
-        /* Shows the 'expand' icon in the floating state */
-        @apply tw:inline-block!;
-    }
-
-    .sidebar-floating .sidebar-title span {
-        @apply tw:lg:invisible tw:lg:group-hover:visible
-    }
-
-    .sidebar-submenu-header {
-        @apply tw:flex;
-    }
-
-    .sidebar-floating .sidebar-submenu-header {
-        @apply tw:lg:hidden tw:lg:group-hover:flex;
-    }
-
-    .sidebar-floating .sidebar-submenu-header h5 {
-        @apply tw:lg:invisible tw:lg:group-hover:visible;
-    }
-
-    .sidebar-floating .sidebar-submenu-header button {
-        @apply tw:lg:hidden tw:lg:group-hover:inline;
-    }
-
-    .sidebar-floating .list-unstyled {
-        @apply tw:group-hover:lg:overflow-y-auto tw:lg:overflow-y-hidden tw:overflow-y-auto tw:overflow-x-hidden;
-    }
-
-    .sidebar-floating .sidebar-item {
-        @apply tw:text-wrap tw:lg:text-nowrap ;
-    }
-
-
-    /* --- STATE 2: Fixed (Permanently Expanded) --- */
-    .sidebar-fixed {
-        /* Sets the fixed, expanded width for the container */
-        @apply tw:lg:w-[17%] tw:transition-all tw:duration-100;
-    }
-
-    .sidebar-fixed #sidebar {
-        /* Sets the fixed, expanded width for the inner navigation */
-        @apply tw:lg:w-[17%] tw:transition-all tw:duration-100;
-    }
-
-    .sidebar-fixed + main {
-        /* Adjusts the main content margin to account for the expanded sidebar */
-        @apply tw:lg:ml-[17%] tw:transition-all tw:duration-100;
-
-        /* Using 16vw to account for padding/margins */
-    }
-
-    .sidebar-fixed .sidebar-item {
-        @apply tw:text-wrap;
-    }
-
-    .sidebar-fixed .sidebar-item span {
-        /* Ensures text labels are always visible */
-        @apply tw:lg:visible;
-    }
-
-    .sidebar-fixed .sidebar-menu-header {
-        /* Ensures menu headers are always visible */
-        @apply tw:lg:inline;
-    }
-
-    .sidebar-fixed #sidebar-toggle-btn .fa-thumbtack-slash {
-        /* Shows the 'pin' icon in the fixed state */
-        @apply tw:inline-block!;
-    }
-
-    .sidebar-fixed #sidebar-toggle-btn .fa-thumbtack {
-        /* Hides the 'expand' icon in the fixed state */
-        @apply tw:hidden!;
-    }
-
-    .sidebar-fixed .sidebar-title span {
-        @apply tw:lg:visible;
-    }
-
-    .sidebar-fixed .sidebar-submenu-header {
-        /* Ensures menu headers are always visible */
-        @apply tw:lg:flex;
-    }
-
-    .sidebar-fixed .list-unstyled  {
-        @apply tw:overflow-y-auto tw:overflow-x-hidden;
-    }
-}