feat: initial commit

.gitignore

@@ -160,6 +160,3 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-
-postgres_data/
-.prod.env

README.md

@@ -126,7 +126,6 @@ To create the first user, open the container's console using Unraid's UI, by cli
 
 | variable                      | type        | default                           | explanation                                                                                                                                                                                                                              |
 |-------------------------------|-------------|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| INTERNAL_PORT                 | int         | 8000                              | The port on which the app listens on. Defaults to 8000 if not set.                                                                                                                                       |
 | DJANGO_ALLOWED_HOSTS          | string      | localhost 127.0.0.1               | A list of space separated domains and IPs representing the host/domain names that WYGIWYH site can serve. [Click here](https://docs.djangoproject.com/en/5.1/ref/settings/#allowed-hosts) for more details                               |
 | HTTPS_ENABLED                 | true\|false | false                             | Whether to use secure cookies. If this is set to true, the cookie will be marked as “secure”, which means browsers may ensure that the cookie is only sent under an HTTPS connection                                                     |
 | URL                           | string      | http://localhost http://127.0.0.1 | A list of space separated domains and IPs (with the protocol) representing the trusted origins for unsafe requests (e.g. POST). [Click here](https://docs.djangoproject.com/en/5.1/ref/settings/#csrf-trusted-origins ) for more details |

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/forms.py

@@ -3,7 +3,6 @@ from crispy_forms.bootstrap import FormActions
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field, Column, Row
 from django import forms
-from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 
 from apps.accounts.models import Account
@@ -16,7 +15,6 @@ from apps.common.widgets.crispy.submit import NoClassSubmit
 from apps.common.widgets.tom_select import TomSelect
 from apps.transactions.models import TransactionCategory, TransactionTag
 from apps.common.widgets.decimal import ArbitraryDecimalDisplayNumberInput
-from apps.currencies.models import Currency
 
 
 class AccountGroupForm(forms.ModelForm):
@@ -81,18 +79,6 @@ class AccountForm(forms.ModelForm):
 
         self.fields["group"].queryset = AccountGroup.objects.all()
 
-        if self.instance.id:
-            qs = Currency.objects.filter(
-                Q(is_archived=False) | Q(accounts=self.instance.id)
-            ).distinct()
-            self.fields["currency"].queryset = qs
-            self.fields["exchange_currency"].queryset = qs
-
-        else:
-            qs = Currency.objects.filter(Q(is_archived=False))
-            self.fields["currency"].queryset = qs
-            self.fields["exchange_currency"].queryset = qs
-
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.helper.form_method = "post"

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/api/views/transactions.py

@@ -1,5 +1,3 @@
-from copy import deepcopy
-
 from rest_framework import viewsets
 
 from apps.api.custom.pagination import CustomPageNumberPagination
@@ -32,9 +30,8 @@ class TransactionViewSet(viewsets.ModelViewSet):
         transaction_created.send(sender=instance)
 
     def perform_update(self, serializer):
-        old_data = deepcopy(Transaction.objects.get(pk=serializer.data["pk"]))
         instance = serializer.save()
-        transaction_updated.send(sender=instance, old_data=old_data)
+        transaction_updated.send(sender=instance)
 
     def partial_update(self, request, *args, **kwargs):
         kwargs["partial"] = True

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/decimals.py

@@ -9,8 +9,5 @@ def truncate_decimal(value, decimal_places):
     :param decimal_places: The number of decimal places to keep
     :return: Truncated Decimal value
     """
-    if isinstance(value, (int, float)):
-        value = Decimal(str(value))
-
     multiplier = Decimal(10**decimal_places)
     return (value * multiplier).to_integral_value(rounding=ROUND_DOWN) / multiplier

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 (
+    if user and user.is_authenticated and hasattr(user, "settings") and use_l10n:
-        user
-        and user.is_authenticated
-        and hasattr(user, "settings")
-        and use_l10n is not False
-    ):
         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/tasks.py

@@ -23,7 +23,7 @@ async def remove_old_jobs(context, timestamp):
         return await builtin_tasks.remove_old_jobs(
             context,
             max_hours=744,
-            remove_failed=True,
+            remove_error=True,
             remove_cancelled=True,
             remove_aborted=True,
         )

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,8 +35,9 @@ 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')}', "
-                "x-on:keyup": "if (!['Control', 'Shift', 'Alt', 'Meta'].includes($event.key) && !(($event.ctrlKey || $event.metaKey) && $event.key.toLowerCase() === 'a')) $el.dispatchEvent(new Event('input'))",
+                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,
+    "synth_finance": SynthFinanceProvider,
-    "coingecko_pro": providers.CoinGeckoProProvider,
+    "synth_finance_stock": SynthFinanceStockProvider,
-    "transitive": providers.TransitiveRateProvider,
+    "coingecko_free": CoinGeckoFreeProvider,
-    "frankfurter": providers.FrankfurterProvider,
+    "coingecko_pro": CoinGeckoProProvider,
-    "twelvedata": providers.TwelveDataProvider,
+    "transitive": TransitiveRateProvider,
-    "twelvedatamarkets": providers.TwelveDataMarketsProvider,
 }
 
 
@@ -198,63 +203,21 @@ class ExchangeRateFetcher:
 
                 if provider.rates_inverted:
                     # If rates are inverted, we need to swap currencies
-                    if service.singleton:
+                    ExchangeRate.objects.create(
-                        # Try to get the last automatically created exchange rate
+                        from_currency=to_currency,
-                        exchange_rate = (
+                        to_currency=from_currency,
-                            ExchangeRate.objects.filter(
+                        rate=rate,
-                                automatic=True,
+                        date=timezone.now(),
-                                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()
-
                     processed_pairs.add((to_currency.id, from_currency.id))
                 else:
                     # If rates are not inverted, we can use them as is
-                    if service.singleton:
+                    ExchangeRate.objects.create(
-                        # Try to get the last automatically created exchange rate
+                        from_currency=from_currency,
-                        exchange_rate = (
+                        to_currency=to_currency,
-                            ExchangeRate.objects.filter(
+                        rate=rate,
-                                automatic=True,
+                        date=timezone.now(),
-                                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()
-
                     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

@@ -26,7 +26,6 @@ class CurrencyForm(forms.ModelForm):
             "suffix",
             "code",
             "exchange_currency",
-            "is_archived",
         ]
         widgets = {
             "exchange_currency": TomSelect(),
@@ -41,7 +40,6 @@ class CurrencyForm(forms.ModelForm):
         self.helper.layout = Layout(
             "code",
             "name",
-            Switch("is_archived"),
             "decimal_places",
             "prefix",
             "suffix",
@@ -116,7 +114,6 @@ class ExchangeRateServiceForm(forms.ModelForm):
             "fetch_interval",
             "target_currencies",
             "target_accounts",
-            "singleton",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -129,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/migrations/0022_currency_is_archived.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-30 00:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('currencies', '0021_alter_exchangerateservice_service_type'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='currency',
-            name='is_archived',
-            field=models.BooleanField(default=False, verbose_name='Archived'),
-        ),
-    ]

app/apps/currencies/models.py

@@ -32,11 +32,6 @@ class Currency(models.Model):
         help_text=_("Default currency for exchange calculations"),
     )
 
-    is_archived = models.BooleanField(
-        default=False,
-        verbose_name=_("Archived"),
-    )
-
     def __str__(self):
         return self.name
 
@@ -75,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")
@@ -99,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")
@@ -156,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/currencies/tests.py

@@ -40,6 +40,12 @@ class CurrencyTests(TestCase):
         with self.assertRaises(ValidationError):
             currency.full_clean()
 
+    def test_currency_unique_code(self):
+        """Test that currency codes must be unique"""
+        Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)
+        with self.assertRaises(IntegrityError):
+            Currency.objects.create(code="USD", name="Another Dollar", decimal_places=2)
+
     def test_currency_unique_name(self):
         """Test that currency names must be unique"""
         Currency.objects.create(code="USD", name="US Dollar", decimal_places=2)

app/apps/insights/utils/category_overview.py

@@ -9,13 +9,8 @@ from apps.currencies.models import Currency
 from apps.currencies.utils.convert import convert
 
 
-def get_categories_totals(
+def get_categories_totals(transactions_queryset, ignore_empty=False):
-    transactions_queryset, ignore_empty=False, show_entities=False
+    # First get the category totals as before
-):
-    # Step 1: Aggregate transaction data by category and currency.
-    # This query calculates the total current and projected income/expense for each
-    # category by grouping transactions and summing up their amounts based on their
-    # type (income/expense) and payment status (paid/unpaid).
     category_currency_metrics = (
         transactions_queryset.values(
             "category",
@@ -79,10 +74,7 @@ def get_categories_totals(
         .order_by("category__name")
     )
 
-    # Step 2: Aggregate transaction data by tag, category, and currency.
+    # Get tag totals within each category with currency details
-    # This is similar to the category metrics but adds tags to the grouping,
-    # allowing for a breakdown of totals by tag within each category. It also
-    # handles untagged transactions, where the 'tags' field is None.
     tag_metrics = transactions_queryset.values(
         "category",
         "tags",
@@ -137,12 +129,10 @@ def get_categories_totals(
         ),
     )
 
-    # Step 3: Initialize the main dictionary to structure the final results.
+    # Process the results to structure by category
-    # The data will be organized hierarchically: category -> currency -> tags -> entities.
     result = {}
 
-    # Step 4: Process the aggregated category metrics to build the initial result structure.
+    # Process category totals first
-    # This loop iterates through each category's metrics and populates the `result` dict.
     for metric in category_currency_metrics:
         # Skip empty categories if ignore_empty is True
         if ignore_empty and all(
@@ -193,7 +183,7 @@ def get_categories_totals(
             "total_final": total_final,
         }
 
-        # Step 4a: Handle currency conversion for category totals if an exchange currency is defined.
+        # Add exchanged values if exchange_currency exists
         if metric["account__currency__exchange_currency"]:
             from_currency = Currency.objects.get(id=currency_id)
             exchange_currency = Currency.objects.get(
@@ -232,7 +222,7 @@ def get_categories_totals(
 
         result[category_id]["currencies"][currency_id] = currency_data
 
-    # Step 5: Process the aggregated tag metrics and integrate them into the result structure.
+    # Process tag totals and add them to the result, including untagged
     for tag_metric in tag_metrics:
         category_id = tag_metric["category"]
         tag_id = tag_metric["tags"]  # Will be None for untagged transactions
@@ -250,7 +240,6 @@ def get_categories_totals(
                 result[category_id]["tags"][tag_key] = {
                     "name": tag_name,
                     "currencies": {},
-                    "entities": {},
                 }
 
             currency_id = tag_metric["account__currency"]
@@ -289,7 +278,7 @@ def get_categories_totals(
                 "total_final": tag_total_final,
             }
 
-            # Step 5a: Handle currency conversion for tag totals.
+            # Add exchange currency support for tags
             if tag_metric["account__currency__exchange_currency"]:
                 from_currency = Currency.objects.get(id=currency_id)
                 exchange_currency = Currency.objects.get(
@@ -330,175 +319,4 @@ def get_categories_totals(
                 currency_id
             ] = tag_currency_data
 
-    # Step 6: If requested, aggregate and process entity-level 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 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 if entity_id is not None else "no_entity"
-                    entity_name = (
-                        entity_metric["entities__name"]
-                        if entity_id is not None
-                        else None
-                    )
-
-                    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(
+def get_transactions(request, include_unpaid=True, include_silent=False):
-    request, include_unpaid=True, include_silent=False, include_untracked_accounts=False
-):
     transactions = Transaction.objects.all()
 
     filter_type = request.GET.get("type", None)
@@ -97,11 +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()
-        )
-
-    transactions = transactions.exclude(account__currency__is_archived=True)
-
     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,
+        transactions_queryset=transactions, ignore_empty=False
-        ignore_empty=False,
-        show_entities=show_entities,
     )
 
     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 = (
+    transactions_currency_queryset = Transaction.objects.filter(
-        Transaction.objects.filter(
+        is_paid=True, account__is_archived=False, account__is_asset=False
-            is_paid=True, account__is_archived=False, account__is_asset=False
+    ).order_by(
-        )
+        "account__currency__name",
-        .exclude(account__in=request.user.untracked_accounts.all())
-        .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 = (
+    base_queryset = Transaction.objects.filter(
-        Transaction.objects.filter(
+        reference_date__year=year, reference_date__month=month, account__is_asset=False
-            reference_date__year=year,
+    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-            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())
-    )
 
     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 = (
+    base_queryset = Transaction.objects.filter(
-        Transaction.objects.filter(
+        reference_date__year=year,
-            reference_date__year=year,
+        reference_date__month=month,
-            reference_date__month=month,
+    ).exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-        )
-        .exclude(Q(Q(category__mute=True) & ~Q(category=None)) | Q(mute=True))
-        .exclude(account__in=request.user.untracked_accounts.all())
-    )
 
     currency_data = calculate_currency_totals(base_queryset.all(), ignore_empty=True)
     currency_percentages = calculate_percentage_distribution(currency_data)

app/apps/net_worth/utils/calculate_net_worth.py

@@ -30,7 +30,6 @@ def calculate_historical_currency_net_worth(queryset):
             | Q(accounts__visibility="private", accounts__owner=None),
             accounts__is_archived=False,
             accounts__isnull=False,
-            is_archived=False,
         )
         .values_list("name", flat=True)
         .distinct()

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 = (
+        transactions_currency_queryset = Transaction.objects.filter(
-            Transaction.objects.filter(is_paid=True, account__is_archived=False)
+            is_paid=True, account__is_archived=False
-            .order_by(
+        ).order_by(
-                "account__currency__name",
+            "account__currency__name",
-            )
-            .exclude(account__in=request.user.untracked_accounts.all())
         )
         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 = (
+        transactions_currency_queryset = Transaction.objects.filter(
-            Transaction.objects.filter(account__is_archived=False)
+            account__is_archived=False
-            .order_by(
+        ).order_by(
-                "account__currency__name",
+            "account__currency__name",
-            )
-            .exclude(account__in=request.user.untracked_accounts.all())
         )
         transactions_account_queryset = Transaction.objects.filter(
             account__is_archived=False

app/apps/rules/forms.py

@@ -1,19 +1,15 @@
 from crispy_bootstrap5.bootstrap5 import Switch, BS5Accordion
 from crispy_forms.bootstrap import FormActions, AccordionGroup
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field, Row, Column, HTML
+from crispy_forms.layout import Layout, Field, Row, Column
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 from apps.common.widgets.crispy.submit import NoClassSubmit
-from apps.common.widgets.crispy.submit import NoClassSubmit
+from apps.common.widgets.tom_select import TomSelect
-from apps.common.widgets.tom_select import TomSelect, TransactionSelect
 from apps.rules.models import TransactionRule, UpdateOrCreateTransactionRuleAction
 from apps.rules.models import TransactionRuleAction
-from apps.common.fields.forms.dynamic_select import DynamicModelChoiceField
-from apps.transactions.forms import BulkEditTransactionForm
-from apps.transactions.models import Transaction
 
 
 class TransactionRuleForm(forms.ModelForm):
@@ -44,8 +40,6 @@ class TransactionRuleForm(forms.ModelForm):
                 Column(Switch("on_create")),
                 Column(Switch("on_delete")),
             ),
-            "order",
-            Switch("sequenced"),
             "description",
             "trigger",
         )
@@ -71,11 +65,10 @@ class TransactionRuleForm(forms.ModelForm):
 class TransactionRuleActionForm(forms.ModelForm):
     class Meta:
         model = TransactionRuleAction
-        fields = ("value", "field", "order")
+        fields = ("value", "field")
         labels = {
             "field": _("Set field"),
             "value": _("To"),
-            "order": _("Order"),
         }
         widgets = {"field": TomSelect(clear_button=False)}
 
@@ -89,7 +82,6 @@ class TransactionRuleActionForm(forms.ModelForm):
         self.helper.form_method = "post"
         # TO-DO: Add helper with available commands
         self.helper.layout = Layout(
-            "order",
             "field",
             "value",
         )
@@ -155,11 +147,9 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_category_operator": TomSelect(clear_button=False),
             "search_internal_note_operator": TomSelect(clear_button=False),
             "search_internal_id_operator": TomSelect(clear_button=False),
-            "search_mute_operator": TomSelect(clear_button=False),
         }
 
         labels = {
-            "order": _("Order"),
             "search_account_operator": _("Operator"),
             "search_type_operator": _("Operator"),
             "search_is_paid_operator": _("Operator"),
@@ -173,7 +163,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_internal_id_operator": _("Operator"),
             "search_tags_operator": _("Operator"),
             "search_entities_operator": _("Operator"),
-            "search_mute_operator": _("Operator"),
             "search_account": _("Account"),
             "search_type": _("Type"),
             "search_is_paid": _("Paid"),
@@ -187,7 +176,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "search_internal_id": _("Internal ID"),
             "search_tags": _("Tags"),
             "search_entities": _("Entities"),
-            "search_mute": _("Mute"),
             "set_account": _("Account"),
             "set_type": _("Type"),
             "set_is_paid": _("Paid"),
@@ -201,7 +189,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
             "set_category": _("Category"),
             "set_internal_note": _("Internal Note"),
             "set_internal_id": _("Internal ID"),
-            "set_mute": _("Mute"),
         }
 
     def __init__(self, *args, **kwargs):
@@ -213,7 +200,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
         self.helper.form_method = "post"
 
         self.helper.layout = Layout(
-            "order",
             BS5Accordion(
                 AccordionGroup(
                     _("Search Criteria"),
@@ -238,16 +224,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
                             css_class="form-group col-md-8",
                         ),
                     ),
-                    Row(
-                        Column(
-                            Field("search_mute_operator"),
-                            css_class="form-group col-md-4",
-                        ),
-                        Column(
-                            Field("search_mute", rows=1),
-                            css_class="form-group col-md-8",
-                        ),
-                    ),
                     Row(
                         Column(
                             Field("search_account_operator"),
@@ -364,7 +340,6 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
                     _("Set Values"),
                     Field("set_type", rows=1),
                     Field("set_is_paid", rows=1),
-                    Field("set_mute", rows=1),
                     Field("set_account", rows=1),
                     Field("set_entities", rows=1),
                     Field("set_date", rows=1),
@@ -406,112 +381,3 @@ class UpdateOrCreateTransactionRuleActionForm(forms.ModelForm):
         if commit:
             instance.save()
         return instance
-
-
-class DryRunCreatedTransacion(forms.Form):
-    transaction = DynamicModelChoiceField(
-        model=Transaction,
-        to_field_name="id",
-        label=_("Transaction"),
-        required=True,
-        queryset=Transaction.objects.none(),
-        widget=TransactionSelect(clear_button=False, income=True, expense=True),
-        help_text=_("Type to search for a transaction"),
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-        self.helper.layout = Layout(
-            "transaction",
-            FormActions(
-                NoClassSubmit(
-                    "submit", _("Test"), css_class="btn btn-outline-primary w-100"
-                ),
-            ),
-        )
-
-        if self.data.get("transaction"):
-            try:
-                transaction = Transaction.objects.get(id=self.data.get("transaction"))
-            except Transaction.DoesNotExist:
-                transaction = None
-
-            if transaction:
-                self.fields["transaction"].queryset = Transaction.objects.filter(
-                    id=transaction.id
-                )
-
-
-class DryRunDeletedTransacion(forms.Form):
-    transaction = DynamicModelChoiceField(
-        model=Transaction,
-        to_field_name="id",
-        label=_("Transaction"),
-        required=True,
-        queryset=Transaction.objects.none(),
-        widget=TransactionSelect(clear_button=False, income=True, expense=True),
-        help_text=_("Type to search for a transaction"),
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-        self.helper.layout = Layout(
-            "transaction",
-            FormActions(
-                NoClassSubmit(
-                    "submit", _("Test"), css_class="btn btn-outline-primary w-100"
-                ),
-            ),
-        )
-
-        if self.data.get("transaction"):
-            try:
-                transaction = Transaction.objects.get(id=self.data.get("transaction"))
-            except Transaction.DoesNotExist:
-                transaction = None
-
-            if transaction:
-                self.fields["transaction"].queryset = Transaction.objects.filter(
-                    id=transaction.id
-                )
-
-
-class DryRunUpdatedTransactionForm(BulkEditTransactionForm):
-    transaction = DynamicModelChoiceField(
-        model=Transaction,
-        to_field_name="id",
-        label=_("Transaction"),
-        required=True,
-        queryset=Transaction.objects.none(),
-        widget=TransactionSelect(clear_button=False, income=True, expense=True),
-        help_text=_("Type to search for a transaction"),
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.helper.layout.insert(0, "transaction")
-        self.helper.layout.insert(1, HTML("<hr/>"))
-
-        # Change submit button
-        self.helper.layout[-1] = FormActions(
-            NoClassSubmit(
-                "submit", _("Test"), css_class="btn btn-outline-primary w-100"
-            )
-        )
-
-        if self.data.get("transaction"):
-            try:
-                transaction = Transaction.objects.get(id=self.data.get("transaction"))
-            except Transaction.DoesNotExist:
-                transaction = None
-
-            if transaction:
-                self.fields["transaction"].queryset = Transaction.objects.filter(
-                    id=transaction.id
-                )

app/apps/rules/migrations/0015_alter_transactionruleaction_options_and_more.py

@@ -1,39 +0,0 @@
-# Generated by Django 5.2 on 2025-08-30 18:48
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("rules", "0014_alter_transactionrule_owner_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="transactionruleaction",
-            options={
-                "ordering": ["order"],
-                "verbose_name": "Edit transaction action",
-                "verbose_name_plural": "Edit transaction actions",
-            },
-        ),
-        migrations.AlterModelOptions(
-            name="updateorcreatetransactionruleaction",
-            options={
-                "ordering": ["order"],
-                "verbose_name": "Update or create transaction action",
-                "verbose_name_plural": "Update or create transaction actions",
-            },
-        ),
-        migrations.AddField(
-            model_name="transactionruleaction",
-            name="order",
-            field=models.PositiveIntegerField(default=0, verbose_name="Order"),
-        ),
-        migrations.AddField(
-            model_name="updateorcreatetransactionruleaction",
-            name="order",
-            field=models.PositiveIntegerField(default=0, verbose_name="Order"),
-        ),
-    ]

app/apps/rules/migrations/0016_transactionrule_sequenced.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-31 18:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rules', '0015_alter_transactionruleaction_options_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='transactionrule',
-            name='sequenced',
-            field=models.BooleanField(default=False, verbose_name='Sequenced'),
-        ),
-    ]

app/apps/rules/migrations/0017_updateorcreatetransactionruleaction_search_mute_and_more.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.2.5 on 2025-08-31 19:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rules', '0016_transactionrule_sequenced'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='updateorcreatetransactionruleaction',
-            name='search_mute',
-            field=models.TextField(blank=True, verbose_name='Search Mute'),
-        ),
-        migrations.AddField(
-            model_name='updateorcreatetransactionruleaction',
-            name='search_mute_operator',
-            field=models.CharField(choices=[('exact', 'is exactly'), ('contains', 'contains'), ('startswith', 'starts with'), ('endswith', 'ends with'), ('eq', 'equals'), ('gt', 'greater than'), ('lt', 'less than'), ('gte', 'greater than or equal'), ('lte', 'less than or equal')], default='exact', max_length=10, verbose_name='Mute Operator'),
-        ),
-        migrations.AddField(
-            model_name='updateorcreatetransactionruleaction',
-            name='set_mute',
-            field=models.TextField(blank=True, verbose_name='Mute'),
-        ),
-        migrations.AlterField(
-            model_name='transactionruleaction',
-            name='field',
-            field=models.CharField(choices=[('account', 'Account'), ('type', 'Type'), ('is_paid', 'Paid'), ('date', 'Date'), ('reference_date', 'Reference Date'), ('mute', 'Mute'), ('amount', 'Amount'), ('description', 'Description'), ('notes', 'Notes'), ('category', 'Category'), ('tags', 'Tags'), ('entities', 'Entities'), ('internal_nome', 'Internal Note'), ('internal_id', 'Internal ID')], max_length=50, verbose_name='Field'),
-        ),
-    ]

app/apps/rules/migrations/0018_transactionrule_order.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.5 on 2025-09-02 14:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rules', '0017_updateorcreatetransactionruleaction_search_mute_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='transactionrule',
-            name='order',
-            field=models.PositiveIntegerField(default=0, verbose_name='Order'),
-        ),
-    ]

app/apps/rules/models.py

@@ -13,11 +13,6 @@ class TransactionRule(SharedObject):
     name = models.CharField(max_length=100, verbose_name=_("Name"))
     description = models.TextField(blank=True, null=True, verbose_name=_("Description"))
     trigger = models.TextField(verbose_name=_("Trigger"))
-    sequenced = models.BooleanField(
-        verbose_name=_("Sequenced"),
-        default=False,
-    )
-    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     objects = SharedObjectManager()
     all_objects = models.Manager()  # Unfiltered manager
@@ -37,15 +32,12 @@ class TransactionRuleAction(models.Model):
         is_paid = "is_paid", _("Paid")
         date = "date", _("Date")
         reference_date = "reference_date", _("Reference Date")
-        mute = "mute", _("Mute")
         amount = "amount", _("Amount")
         description = "description", _("Description")
         notes = "notes", _("Notes")
         category = "category", _("Category")
         tags = "tags", _("Tags")
         entities = "entities", _("Entities")
-        internal_note = "internal_nome", _("Internal Note")
-        internal_id = "internal_id", _("Internal ID")
 
     rule = models.ForeignKey(
         TransactionRule,
@@ -59,7 +51,6 @@ class TransactionRuleAction(models.Model):
         verbose_name=_("Field"),
     )
     value = models.TextField(verbose_name=_("Value"))
-    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     def __str__(self):
         return f"{self.rule} - {self.field} - {self.value}"
@@ -68,11 +59,6 @@ class TransactionRuleAction(models.Model):
         verbose_name = _("Edit transaction action")
         verbose_name_plural = _("Edit transaction actions")
         unique_together = (("rule", "field"),)
-        ordering = ["order"]
-
-    @property
-    def action_type(self):
-        return "edit_transaction"
 
 
 class UpdateOrCreateTransactionRuleAction(models.Model):
@@ -251,17 +237,6 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
         verbose_name="Internal ID Operator",
     )
 
-    search_mute = models.TextField(
-        verbose_name="Search Mute",
-        blank=True,
-    )
-    search_mute_operator = models.CharField(
-        max_length=10,
-        choices=SearchOperator.choices,
-        default=SearchOperator.EXACT,
-        verbose_name="Mute Operator",
-    )
-
     # Set fields
     set_account = models.TextField(
         verbose_name=_("Account"),
@@ -315,21 +290,10 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
         verbose_name=_("Tags"),
         blank=True,
     )
-    set_mute = models.TextField(
-        verbose_name=_("Mute"),
-        blank=True,
-    )
-
-    order = models.PositiveIntegerField(default=0, verbose_name=_("Order"))
 
     class Meta:
         verbose_name = _("Update or create transaction action")
         verbose_name_plural = _("Update or create transaction actions")
-        ordering = ["order"]
-
-    @property
-    def action_type(self):
-        return "update_or_create_transaction"
 
     def __str__(self):
         return f"Update or create transaction action for {self.rule}"
@@ -361,10 +325,6 @@ class UpdateOrCreateTransactionRuleAction(models.Model):
             value = simple.eval(self.search_is_paid)
             search_query &= add_to_query("is_paid", value, self.search_is_paid_operator)
 
-        if self.search_mute:
-            value = simple.eval(self.search_mute)
-            search_query &= add_to_query("mute", value, self.search_mute_operator)
-
         if self.search_date:
             value = simple.eval(self.search_date)
             search_query &= add_to_query("date", value, self.search_date_operator)

app/apps/rules/signals.py

@@ -9,17 +9,40 @@ from apps.transactions.models import (
 )
 from apps.rules.tasks import check_for_transaction_rules
 from apps.common.middleware.thread_local import get_current_user
-from apps.rules.utils.transactions import serialize_transaction
 
 
 @receiver(transaction_created)
 @receiver(transaction_updated)
 @receiver(transaction_deleted)
 def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
-    old_data = kwargs.get("old_data")
     if signal is transaction_deleted:
         # Serialize transaction data for processing
-        transaction_data = serialize_transaction(sender, deleted=True)
+        transaction_data = {
+            "id": sender.id,
+            "account": (sender.account.id, sender.account.name),
+            "account_group": (
+                sender.account.group.id if sender.account.group else None,
+                sender.account.group.name if sender.account.group else None,
+            ),
+            "type": str(sender.type),
+            "is_paid": sender.is_paid,
+            "is_asset": sender.account.is_asset,
+            "is_archived": sender.account.is_archived,
+            "category": (
+                sender.category.id if sender.category else None,
+                sender.category.name if sender.category else None,
+            ),
+            "date": sender.date.isoformat(),
+            "reference_date": sender.reference_date.isoformat(),
+            "amount": str(sender.amount),
+            "description": sender.description,
+            "notes": sender.notes,
+            "tags": list(sender.tags.values_list("id", "name")),
+            "entities": list(sender.entities.values_list("id", "name")),
+            "deleted": True,
+            "internal_note": sender.internal_note,
+            "internal_id": sender.internal_id,
+        }
 
         check_for_transaction_rules.defer(
             transaction_data=transaction_data,
@@ -36,9 +59,6 @@ def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
         dca_entry.amount_received = sender.amount
         dca_entry.save()
 
-    if signal is transaction_updated and old_data:
-        old_data = serialize_transaction(old_data, deleted=False)
-
     check_for_transaction_rules.defer(
         instance_id=sender.id,
         user_id=get_current_user().id,
@@ -47,5 +67,4 @@ def transaction_changed_receiver(sender: Transaction, signal, **kwargs):
             if signal is transaction_created
             else "transaction_updated"
         ),
-        old_data=old_data,
     )

app/apps/rules/urls.py

@@ -42,21 +42,6 @@ urlpatterns = [
         views.transaction_rule_take_ownership,
         name="transaction_rule_take_ownership",
     ),
-    path(
-        "rules/transaction/<int:pk>/dry-run/created/",
-        views.dry_run_rule_created,
-        name="transaction_rule_dry_run_created",
-    ),
-    path(
-        "rules/transaction/<int:pk>/dry-run/deleted/",
-        views.dry_run_rule_deleted,
-        name="transaction_rule_dry_run_deleted",
-    ),
-    path(
-        "rules/transaction/<int:pk>/dry-run/updated/",
-        views.dry_run_rule_updated,
-        name="transaction_rule_dry_run_updated",
-    ),
     path(
         "rules/transaction/<int:pk>/share/",
         views.transaction_rule_share,

app/apps/rules/utils/transactions.py

@@ -1,101 +0,0 @@
-import logging
-from decimal import Decimal
-
-from django.db.models import Sum, Value, DecimalField, Case, When, F
-from django.db.models.functions import Coalesce
-
-from apps.transactions.models import (
-    Transaction,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class TransactionsGetter:
-    def __init__(self, **filters):
-        self.__queryset = Transaction.objects.filter(**filters)
-
-    def exclude(self, **exclude_filters):
-        self.__queryset = self.__queryset.exclude(**exclude_filters)
-
-        return self
-
-    @property
-    def sum(self):
-        return self.__queryset.aggregate(
-            total=Coalesce(
-                Sum("amount"), Value(Decimal("0")), output_field=DecimalField()
-            )
-        )["total"]
-
-    @property
-    def balance(self):
-        return abs(
-            self.__queryset.aggregate(
-                balance=Coalesce(
-                    Sum(
-                        Case(
-                            When(type=Transaction.Type.EXPENSE, then=-F("amount")),
-                            default=F("amount"),
-                            output_field=DecimalField(),
-                        )
-                    ),
-                    Value(Decimal("0")),
-                    output_field=DecimalField(),
-                )
-            )["balance"]
-        )
-
-    @property
-    def raw_balance(self):
-        return self.__queryset.aggregate(
-            balance=Coalesce(
-                Sum(
-                    Case(
-                        When(type=Transaction.Type.EXPENSE, then=-F("amount")),
-                        default=F("amount"),
-                        output_field=DecimalField(),
-                    )
-                ),
-                Value(Decimal("0")),
-                output_field=DecimalField(),
-            )
-        )["balance"]
-
-
-def serialize_transaction(sender: Transaction, deleted: bool):
-    return {
-        "id": sender.id,
-        "account": (sender.account.id, sender.account.name),
-        "account_group": (
-            sender.account.group.id if sender.account.group else None,
-            sender.account.group.name if sender.account.group else None,
-        ),
-        "type": str(sender.type),
-        "is_paid": sender.is_paid,
-        "is_asset": sender.account.is_asset,
-        "is_archived": sender.account.is_archived,
-        "category": (
-            sender.category.id if sender.category else None,
-            sender.category.name if sender.category else None,
-        ),
-        "date": sender.date.isoformat(),
-        "reference_date": sender.reference_date.isoformat(),
-        "amount": str(sender.amount),
-        "description": sender.description,
-        "notes": sender.notes,
-        "tags": list(sender.tags.values_list("id", "name")),
-        "entities": list(sender.entities.values_list("id", "name")),
-        "deleted": deleted,
-        "internal_note": sender.internal_note,
-        "internal_id": sender.internal_id,
-        "mute": sender.mute,
-        "installment_id": sender.installment_id if sender.installment_plan else None,
-        "installment_total": (
-            sender.installment_plan.number_of_installments
-            if sender.installment_plan is not None
-            else None
-        ),
-        "installment": sender.installment_plan is not None,
-        "recurring_transaction": sender.recurring_transaction is not None,
-    }

app/apps/rules/views.py

@@ -1,10 +1,5 @@
-from itertools import chain
-
-from copy import deepcopy
-
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.db import transaction
 from django.http import HttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.translation import gettext_lazy as _
@@ -15,9 +10,6 @@ from apps.rules.forms import (
     TransactionRuleForm,
     TransactionRuleActionForm,
     UpdateOrCreateTransactionRuleActionForm,
-    DryRunCreatedTransacion,
-    DryRunDeletedTransacion,
-    DryRunUpdatedTransactionForm,
 )
 from apps.rules.models import (
     TransactionRule,
@@ -27,11 +19,6 @@ from apps.rules.models import (
 from apps.common.models import SharedObject
 from apps.common.forms import SharedObjectForm
 from apps.common.decorators.demo import disabled_on_demo
-from apps.rules.tasks import check_for_transaction_rules
-from apps.common.middleware.thread_local import get_current_user
-from apps.rules.signals import transaction_created, transaction_updated
-from apps.rules.utils.transactions import serialize_transaction
-from apps.transactions.models import Transaction
 
 
 @login_required
@@ -49,7 +36,7 @@ def rules_index(request):
 @disabled_on_demo
 @require_http_methods(["GET"])
 def rules_list(request):
-    transaction_rules = TransactionRule.objects.all().order_by("order", "id")
+    transaction_rules = TransactionRule.objects.all().order_by("id")
     return render(
         request,
         "rules/fragments/list.html",
@@ -153,20 +140,10 @@ def transaction_rule_edit(request, transaction_rule_id):
 def transaction_rule_view(request, transaction_rule_id):
     transaction_rule = get_object_or_404(TransactionRule, id=transaction_rule_id)
 
-    edit_actions = transaction_rule.transaction_actions.all()
-    update_or_create_actions = (
-        transaction_rule.update_or_create_transaction_actions.all()
-    )
-
-    all_actions = sorted(
-        chain(edit_actions, update_or_create_actions),
-        key=lambda a: a.order,
-    )
-
     return render(
         request,
         "rules/fragments/transaction_rule/view.html",
-        {"transaction_rule": transaction_rule, "all_actions": all_actions},
+        {"transaction_rule": transaction_rule},
     )
 
 
@@ -429,156 +406,3 @@ def update_or_create_transaction_rule_action_delete(request, pk):
             "HX-Trigger": "updated, hide_offcanvas",
         },
     )
-
-
-@only_htmx
-@login_required
-@disabled_on_demo
-@require_http_methods(["GET", "POST"])
-def dry_run_rule_created(request, pk):
-    rule = get_object_or_404(TransactionRule, id=pk)
-    logs = None
-    results = None
-
-    if request.method == "POST":
-        form = DryRunCreatedTransacion(request.POST)
-        if form.is_valid():
-            try:
-                with transaction.atomic():
-                    logs, results = check_for_transaction_rules(
-                        instance_id=form.cleaned_data["transaction"].id,
-                        signal="transaction_created",
-                        dry_run=True,
-                        rule_id=rule.id,
-                        user_id=get_current_user().id,
-                    )
-                    logs = "\n".join(logs)
-
-                    response = render(
-                        request,
-                        "rules/fragments/transaction_rule/dry_run/created.html",
-                        {"form": form, "rule": rule, "logs": logs, "results": results},
-                    )
-
-                    raise Exception("ROLLBACK")
-            except Exception:
-                pass
-
-            return response
-
-    else:
-        form = DryRunCreatedTransacion()
-
-    return render(
-        request,
-        "rules/fragments/transaction_rule/dry_run/created.html",
-        {"form": form, "rule": rule, "logs": logs, "results": results},
-    )
-
-
-@only_htmx
-@login_required
-@disabled_on_demo
-@require_http_methods(["GET", "POST"])
-def dry_run_rule_deleted(request, pk):
-    rule = get_object_or_404(TransactionRule, id=pk)
-    logs = None
-    results = None
-
-    if request.method == "POST":
-        form = DryRunDeletedTransacion(request.POST)
-        if form.is_valid():
-            try:
-                with transaction.atomic():
-                    logs, results = check_for_transaction_rules(
-                        instance_id=form.cleaned_data["transaction"].id,
-                        signal="transaction_deleted",
-                        dry_run=True,
-                        rule_id=rule.id,
-                        user_id=get_current_user().id,
-                    )
-                    logs = "\n".join(logs)
-
-                    response = render(
-                        request,
-                        "rules/fragments/transaction_rule/dry_run/created.html",
-                        {"form": form, "rule": rule, "logs": logs, "results": results},
-                    )
-
-                    raise Exception("ROLLBACK")
-            except Exception:
-                pass
-
-        return response
-
-    else:
-        form = DryRunDeletedTransacion()
-
-    return render(
-        request,
-        "rules/fragments/transaction_rule/dry_run/deleted.html",
-        {"form": form, "rule": rule, "logs": logs, "results": results},
-    )
-
-
-@only_htmx
-@login_required
-@disabled_on_demo
-@require_http_methods(["GET", "POST"])
-def dry_run_rule_updated(request, pk):
-    rule = get_object_or_404(TransactionRule, id=pk)
-    logs = None
-    results = None
-
-    if request.method == "POST":
-        form = DryRunUpdatedTransactionForm(request.POST)
-        if form.is_valid():
-            base_transaction = Transaction.objects.get(
-                id=request.POST.get("transaction")
-            )
-            old_data = deepcopy(base_transaction)
-            try:
-                with transaction.atomic():
-                    for field_name, value in form.cleaned_data.items():
-                        if value or isinstance(
-                            value, bool
-                        ):  # Only update fields that have been filled in the form
-                            if field_name == "tags":
-                                base_transaction.tags.set(value)
-                            elif field_name == "entities":
-                                base_transaction.entities.set(value)
-                            else:
-                                setattr(base_transaction, field_name, value)
-
-                    base_transaction.save()
-
-                    logs, results = check_for_transaction_rules(
-                        instance_id=base_transaction.id,
-                        signal="transaction_updated",
-                        dry_run=True,
-                        rule_id=rule.id,
-                        user_id=get_current_user().id,
-                        old_data=old_data,
-                    )
-                    logs = "\n".join(logs) if logs else ""
-
-                    response = render(
-                        request,
-                        "rules/fragments/transaction_rule/dry_run/created.html",
-                        {"form": form, "rule": rule, "logs": logs, "results": results},
-                    )
-
-                    # This will rollback the transaction
-                    raise Exception("ROLLBACK")
-            except Exception:
-                pass
-
-            return response
-    else:
-        form = DryRunUpdatedTransactionForm(initial={"is_paid": None, "type": None})
-
-    return render(
-        request,
-        "rules/fragments/transaction_rule/dry_run/updated.html",
-        {"form": form, "rule": rule, "logs": logs, "results": results},
-    )

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(
+        self.form.fields["category"].queryset = TransactionCategory.objects.all()
-            TransactionCategory.objects.values_list("name", "name").order_by("name")
+        self.form.fields["tags"].queryset = TransactionTag.objects.all()
-        )
+        self.form.fields["entities"].queryset = TransactionEntity.objects.all()
-        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

app/apps/transactions/forms.py

@@ -1,5 +1,3 @@
-from copy import deepcopy
-
 from crispy_bootstrap5.bootstrap5 import Switch, BS5Accordion
 from crispy_forms.bootstrap import FormActions, AccordionGroup, AppendedText
 from crispy_forms.helper import FormHelper
@@ -241,16 +239,11 @@ class TransactionForm(forms.ModelForm):
     def save(self, **kwargs):
         is_new = not self.instance.id
 
-        if not is_new:
-            old_data = deepcopy(Transaction.objects.get(pk=self.instance.id))
-        else:
-            old_data = None
-
         instance = super().save(**kwargs)
         if is_new:
             transaction_created.send(sender=instance)
         else:
-            transaction_updated.send(sender=instance, old_data=old_data)
+            transaction_updated.send(sender=instance)
 
         return instance
 
@@ -354,6 +347,11 @@ class QuickTransactionForm(forms.ModelForm):
                 Column("entities", css_class="form-group col-md-6 mb-0"),
                 css_class="form-row",
             ),
+            Row(
+                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
+                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
+                css_class="form-row",
+            ),
             "description",
             Field("amount", inputmode="decimal"),
             Row(
@@ -389,115 +387,35 @@ class QuickTransactionForm(forms.ModelForm):
             )
 
 
-class BulkEditTransactionForm(forms.Form):
+class BulkEditTransactionForm(TransactionForm):
-    type = forms.ChoiceField(
+    is_paid = forms.NullBooleanField(required=False)
-        choices=(Transaction.Type.choices),
-        required=False,
-        label=_("Type"),
-    )
-    is_paid = forms.NullBooleanField(
-        required=False,
-        label=_("Paid"),
-    )
-    account = DynamicModelChoiceField(
-        model=Account,
-        required=False,
-        label=_("Account"),
-        queryset=Account.objects.filter(is_archived=False),
-        widget=TomSelect(clear_button=False, group_by="group"),
-    )
-    date = forms.DateField(
-        label=_("Date"),
-        required=False,
-        widget=AirDatePickerInput(clear_button=False),
-    )
-    reference_date = forms.DateField(
-        widget=AirMonthYearPickerInput(),
-        label=_("Reference Date"),
-        required=False,
-    )
-    amount = forms.DecimalField(
-        max_digits=42,
-        decimal_places=30,
-        required=False,
-        label=_("Amount"),
-        widget=ArbitraryDecimalDisplayNumberInput(),
-    )
-    description = forms.CharField(
-        max_length=500, required=False, label=_("Description")
-    )
-    notes = forms.CharField(
-        required=False,
-        widget=forms.Textarea(attrs={"rows": 3}),
-        label=_("Notes"),
-    )
-    category = DynamicModelChoiceField(
-        create_field="name",
-        model=TransactionCategory,
-        required=False,
-        label=_("Category"),
-        queryset=TransactionCategory.objects.filter(active=True),
-    )
-    tags = DynamicModelMultipleChoiceField(
-        model=TransactionTag,
-        to_field_name="name",
-        create_field="name",
-        required=False,
-        label=_("Tags"),
-        queryset=TransactionTag.objects.filter(active=True),
-    )
-    entities = DynamicModelMultipleChoiceField(
-        model=TransactionEntity,
-        to_field_name="name",
-        create_field="name",
-        required=False,
-        label=_("Entities"),
-        queryset=TransactionEntity.objects.all(),
-    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        # Make all fields optional
+        for field_name, field in self.fields.items():
+            field.required = False
 
-        self.fields["account"].queryset = Account.objects.filter(
+        del self.helper.layout[-1]  # Remove button
-            is_archived=False,
+        del self.helper.layout[0:2]  # Remove type, is_paid field
-        )
 
-        self.fields["category"].queryset = TransactionCategory.objects.filter(
+        self.helper.layout.insert(
-            active=True
+            0,
-        )
-        self.fields["tags"].queryset = TransactionTag.objects.filter(active=True)
-        self.fields["entities"].queryset = TransactionEntity.objects.all()
-
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-        self.helper.form_method = "post"
-        self.helper.layout = Layout(
             Field(
                 "type",
                 template="transactions/widgets/unselectable_income_expense_toggle_buttons.html",
             ),
+        )
+
+        self.helper.layout.insert(
+            1,
             Field(
                 "is_paid",
                 template="transactions/widgets/unselectable_paid_toggle_button.html",
             ),
-            Row(
+        )
-                Column("account", css_class="form-group col-md-6 mb-0"),
+
-                Column("entities", css_class="form-group col-md-6 mb-0"),
+        self.helper.layout.append(
-                css_class="form-row",
-            ),
-            Row(
-                Column(Field("date"), css_class="form-group col-md-6 mb-0"),
-                Column(Field("reference_date"), css_class="form-group col-md-6 mb-0"),
-                css_class="form-row",
-            ),
-            "description",
-            Field("amount", inputmode="decimal"),
-            Row(
-                Column("category", css_class="form-group col-md-6 mb-0"),
-                Column("tags", css_class="form-group col-md-6 mb-0"),
-                css_class="form-row",
-            ),
-            "notes",
             FormActions(
                 NoClassSubmit(
                     "submit", _("Update"), css_class="btn btn-outline-primary w-100"
@@ -505,9 +423,6 @@ class BulkEditTransactionForm(forms.Form):
             ),
         )
 
-        self.fields["amount"].widget = ArbitraryDecimalDisplayNumberInput()
-        self.fields["date"].widget = AirDatePickerInput(clear_button=False)
-
 
 class TransferForm(forms.Form):
     from_account = forms.ModelChoiceField(
@@ -1170,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/models.py

@@ -1,6 +1,4 @@
-import decimal
 import logging
-from copy import deepcopy
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
@@ -35,13 +33,13 @@ transaction_deleted = Signal()
 
 class SoftDeleteQuerySet(models.QuerySet):
     @staticmethod
-    def _emit_signals(instances, created=False, old_data=None):
+    def _emit_signals(instances, created=False):
         """Helper to emit signals for multiple instances"""
-        for i, instance in enumerate(instances):
+        for instance in instances:
             if created:
                 transaction_created.send(sender=instance)
             else:
-                transaction_updated.send(sender=instance, old_data=old_data[i])
+                transaction_updated.send(sender=instance)
 
     def bulk_create(self, objs, emit_signal=True, **kwargs):
         instances = super().bulk_create(objs, **kwargs)
@@ -52,25 +50,22 @@ class SoftDeleteQuerySet(models.QuerySet):
         return instances
 
     def bulk_update(self, objs, fields, emit_signal=True, **kwargs):
-        old_data = deepcopy(objs)
         result = super().bulk_update(objs, fields, **kwargs)
 
         if emit_signal:
-            self._emit_signals(objs, created=False, old_data=old_data)
+            self._emit_signals(objs, created=False)
 
         return result
 
     def update(self, emit_signal=True, **kwargs):
         # Get instances before update
         instances = list(self)
-        old_data = deepcopy(instances)
-
         result = super().update(**kwargs)
 
         if emit_signal:
             # Refresh instances to get new values
             refreshed = self.model.objects.filter(pk__in=[obj.pk for obj in instances])
-            self._emit_signals(refreshed, created=False, old_data=old_data)
+            self._emit_signals(refreshed, created=False)
 
         return result
 
@@ -381,10 +376,7 @@ class Transaction(OwnedObject):
         db_table = "transactions"
         default_manager_name = "objects"
 
-    def clean_fields(self, *args, **kwargs):
+    def save(self, *args, **kwargs):
-        if isinstance(self.amount, (str, int, float)):
-            self.amount = decimal.Decimal(str(self.amount))
-
         self.amount = truncate_decimal(
             value=self.amount, decimal_places=self.account.currency.decimal_places
         )
@@ -394,11 +386,6 @@ class Transaction(OwnedObject):
         elif not self.reference_date and self.date:
             self.reference_date = self.date.replace(day=1)
 
-        super().clean_fields(*args, **kwargs)
-
-    def save(self, *args, **kwargs):
-        # This is not recommended as it will run twice on some cases like form and API saves.
-        # We only do this here because we forgot to independently call it on multiple places.
         self.full_clean()
         super().save(*args, **kwargs)
 
@@ -456,58 +443,12 @@ class Transaction(OwnedObject):
         type_display = self.get_type_display()
         frmt_date = date(self.date, "SHORT_DATE_FORMAT")
         account = self.account
-        tags = (
+        tags = ", ".join([x.name for x in self.tags.all()]) or _("No tags")
-            ", ".join([x.name for x in self.tags.all()])
-            if self.id
-            else None or _("No tags")
-        )
         category = self.category or _("No category")
         amount = localize_number(drop_trailing_zeros(self.amount))
         description = self.description or _("No description")
         return f"[{frmt_date}][{type_display}][{account}] {description} • {category} • {tags} • {amount}"
 
-    def deepcopy(self, memo=None):
-        """
-        Creates a deep copy of the transaction instance.
-
-        This method returns a new, unsaved Transaction instance with the same
-        values as the original, including its many-to-many relationships.
-        The primary key and any other unique fields are reset to avoid
-        database integrity errors upon saving.
-        """
-        if memo is None:
-            memo = {}
-
-        # Create a new instance of the class
-        new_obj = self.__class__()
-        memo[id(self)] = new_obj
-
-        # Copy all concrete fields from the original to the new object
-        for field in self._meta.concrete_fields:
-            # Skip the primary key to allow the database to generate a new one
-            if field.primary_key:
-                continue
-
-            # Reset any unique fields to None to avoid constraint violations
-            if field.unique and field.name == "internal_id":
-                setattr(new_obj, field.name, None)
-                continue
-
-            # Copy the value of the field
-            setattr(new_obj, field.name, getattr(self, field.name))
-
-        # Save the new object to the database to get a primary key
-        new_obj.save()
-
-        # Copy the many-to-many relationships
-        for field in self._meta.many_to_many:
-            source_manager = getattr(self, field.name)
-            destination_manager = getattr(new_obj, field.name)
-            # Set the M2M relationships for the new object
-            destination_manager.set(source_manager.all())
-
-        return new_obj
-
 
 class InstallmentPlan(models.Model):
     class Recurrence(models.TextChoices):

app/apps/transactions/tests.py

@@ -175,6 +175,6 @@ class RecurringTransactionTests(TestCase):
             recurrence_type=RecurringTransaction.RecurrenceType.MONTH,
             recurrence_interval=1,
         )
-        self.assertFalse(recurring.is_paused)
+        self.assertFalse(recurring.paused)
         self.assertEqual(recurring.recurrence_interval, 1)
         self.assertEqual(recurring.account.currency.code, "USD")

app/apps/transactions/views/transactions.py

@@ -213,7 +213,6 @@ def transactions_bulk_edit(request):
         if form.is_valid():
             # Apply changes from the form to all selected transactions
             for transaction in transactions:
-                old_data = deepcopy(transaction)
                 for field_name, value in form.cleaned_data.items():
                     if value or isinstance(
                         value, bool
@@ -226,7 +225,7 @@ def transactions_bulk_edit(request):
                             setattr(transaction, field_name, value)
 
                 transaction.save()
-                transaction_updated.send(sender=transaction, old_data=old_data)
+                transaction_updated.send(sender=transaction)
 
             messages.success(
                 request,
@@ -374,13 +373,10 @@ def transactions_transfer(request):
 @require_http_methods(["GET"])
 def transaction_pay(request, transaction_id):
     transaction = get_object_or_404(Transaction, pk=transaction_id)
-    old_data = deepcopy(transaction)
-
     new_is_paid = False if transaction.is_paid else True
     transaction.is_paid = new_is_paid
     transaction.save()
-
+    transaction_updated.send(sender=transaction)
-    transaction_updated.send(sender=transaction, old_data=old_data)
 
     response = render(
         request,
@@ -398,12 +394,11 @@ def transaction_pay(request, transaction_id):
 @require_http_methods(["GET"])
 def transaction_mute(request, transaction_id):
     transaction = get_object_or_404(Transaction, pk=transaction_id)
-    old_data = deepcopy(transaction)
 
     new_mute = False if transaction.mute else True
     transaction.mute = new_mute
     transaction.save()
-    transaction_updated.send(sender=transaction, old_data=old_data)
+    transaction_updated.send(sender=transaction)
 
     response = render(
         request,
@@ -419,20 +414,19 @@ def transaction_mute(request, transaction_id):
 @require_http_methods(["GET"])
 def transaction_change_month(request, transaction_id, change_type):
     transaction: Transaction = get_object_or_404(Transaction, pk=transaction_id)
-    old_data = deepcopy(transaction)
 
     if change_type == "next":
         transaction.reference_date = transaction.reference_date + relativedelta(
             months=1
         )
         transaction.save()
-        transaction_updated.send(sender=transaction, old_data=old_data)
+        transaction_updated.send(sender=transaction)
     elif change_type == "previous":
         transaction.reference_date = transaction.reference_date - relativedelta(
             months=1
         )
         transaction.save()
-        transaction_updated.send(sender=transaction, old_data=old_data)
+        transaction_updated.send(sender=transaction)
 
     return HttpResponse(
         status=204,
@@ -446,11 +440,9 @@ def transaction_change_month(request, transaction_id, change_type):
 def transaction_move_to_today(request, transaction_id):
     transaction: Transaction = get_object_or_404(Transaction, pk=transaction_id)
 
-    old_data = deepcopy(transaction)
-
     transaction.date = timezone.localdate(timezone.now())
     transaction.save()
-    transaction_updated.send(sender=transaction, old_data=old_data)
+    transaction_updated.send(sender=transaction)
 
     return HttpResponse(
         status=204,
@@ -597,10 +589,7 @@ def transaction_all_currency_summary(request):
 
     f = TransactionsFilter(request.GET, queryset=transactions)
 
-    currency_data = calculate_currency_totals(
+    currency_data = calculate_currency_totals(f.qs.all(), ignore_empty=True)
-        f.qs.exclude(account__in=request.user.untracked_accounts.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

@@ -79,7 +79,7 @@ def yearly_overview_by_currency(request, year: int):
     currency = request.GET.get("currency")
 
     # Base query filter
-    filter_params = {"reference_date__year": year}
+    filter_params = {"reference_date__year": year, "account__is_archived": False}
 
     # Add month filter if provided
     if month:
@@ -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">
+<ul class="nav nav-pills nav-fill" id="yearTabs" role="tablist">
-    {% for x in years_list %}
+  {% for x in years_list %}
-      <li class="nav-item" role="presentation">
+  <li class="nav-item" role="presentation">
-        <button class="nav-link{% if x.grouper == current_year %} active{% endif %}"
+    <button class="nav-link{% if x.grouper == current_year %} active{% endif %}"
-                id="{{ x.grouper }}"
+            id="{{ x.grouper }}"
-                data-bs-toggle="tab"
+            data-bs-toggle="tab"
-                data-bs-target="#{{ x.grouper }}-pane"
+            data-bs-target="#{{ x.grouper }}-pane"
-                type="button"
+            type="button"
-                role="tab"
+            role="tab"
-                aria-controls="{{ x.grouper }}-pane"
+            aria-controls="{{ x.grouper }}-pane"
-                aria-selected="{% if x.grouper == current_year %}true{% else %}false{% endif %}">
+            aria-selected="{% if x.grouper == current_year %}true{% else %}false{% endif %}">
-          {{ x.grouper }}
+      {{ x.grouper }}
-        </button>
+    </button>
-      </li>
+  </li>
-    {% endfor %}
+  {% endfor %}
-  </ul>
+</ul>
-  <div class="tab-content" id="yearTabsContent" hx-boost="true">
+<div class="tab-content" id="yearTabsContent" hx-boost="true">
-    {% for x in years_list %}
+  {% for x in years_list %}
-      <div class="tab-pane fade{% if x.grouper == current_year %} show active{% endif %} mt-2"
+  <div class="tab-pane fade{% if x.grouper == current_year %} show active{% endif %} mt-2"
-           id="{{ x.grouper }}-pane"
+       id="{{ x.grouper }}-pane"
-           role="tabpanel"
+       role="tabpanel"
-           aria-labelledby="{{ x.grouper }}"
+       aria-labelledby="{{ x.grouper }}"
-           tabindex="0">
+       tabindex="0">
-        <ul class="list-group list-group-flush" id="month-year-list">
+    <ul class="list-group list-group-flush" id="month-year-list">
-          {% for month_data in x.list %}
+      {% for month_data in x.list %}
-            <li class="list-group-item tw:hover:bg-zinc-900
+      <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 %}>
+          {% if month_data.month == current_month and month_data.year == current_year %}aria-disabled="true"{% endif %}>
-              <div class="d-flex justify-content-between">
+        <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 %}"
+          <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 }}>
+           href={{ month_data.url }}>
-                  {{ month_data.month|month_name }}</a>
+            {{ month_data.month|month_name }}</a>
-                <span class="badge text-bg-secondary">{{ month_data.transaction_count }}</span>
+          <span class="badge text-bg-secondary">{{ month_data.transaction_count }}</span>
-              </div>
+        </div>
           
-            </li>
+      </li>
-          {% endfor %}
+      {% endfor %}
-        </ul>
+    </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>
   </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

@@ -1,9 +1,8 @@
 {% load markdown %}
 {% load i18n %}
-<div
+<div class="transaction {% if transaction.type == "EX" %}expense{% else %}income{% endif %} tw:group/transaction tw:relative tw:hover:z-10">
-    class="transaction {% if transaction.type == "EX" %}expense{% else %}income{% endif %} tw:group/transaction tw:relative tw:hover:z-10">
   <div class="d-flex my-1">
-    {% if not disable_selection or not dummy %}
+    {% if not disable_selection %}
       <label class="px-3 d-flex align-items-center justify-content-center">
         <input class="form-check-input" type="checkbox" name="transactions" value="{{ transaction.id }}"
                id="check-{{ transaction.id }}" aria-label="{% translate 'Select' %}" hx-preserve>
@@ -20,10 +19,9 @@
             <a class="text-decoration-none p-3 tw:text-gray-500!"
                title="{% if transaction.is_paid %}{% trans 'Paid' %}{% else %}{% trans 'Projected' %}{% endif %}"
                role="button"
-                {% if not dummy %}
                hx-get="{% url 'transaction_pay' transaction_id=transaction.id %}"
                hx-target="closest .transaction"
-               hx-swap="outerHTML"{% endif %}>
+               hx-swap="outerHTML">
               {% if transaction.is_paid %}<i class="fa-regular fa-circle-check"></i>{% else %}<i
                   class="fa-regular fa-circle"></i>{% endif %}
             </a>
@@ -35,8 +33,7 @@
             </div>
           {% endif %}
         </div>
-        <div
+        <div class="col-lg col-12 {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
-            class="col-lg col-12 {% if transaction.account.is_untracked_by or 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>
@@ -61,20 +58,14 @@
           </div>
           <div class="tw:text-gray-400 tw:text-sm">
             {#        Entities #}
-            {% comment %} First, check for the highest priority: a valid 'overriden_entities' list. {% endcomment %}
+            {% with transaction.entities.all as entities %}
-            {% if overriden_entities %}
+              {% if entities %}
-              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
+                  <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ overriden_entities|join:", " }}</div>
+                  <div class="col ps-0">{{ entities|join:", " }}</div>
-              </div>
+                </div>
-
+              {% endif %}
-              {% comment %} If no override, fall back to transaction entities, but ONLY if the transaction has an ID. {% endcomment %}
+            {% endwith %}
-            {% elif transaction.id and transaction.entities.all %}
-              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-user-group fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ transaction.entities.all|join:", " }}</div>
-              </div>
-            {% endif %}
             {#        Notes#}
             {% if transaction.notes %}
               <div class="row mb-2 mb-lg-1 tw:text-gray-400">
@@ -90,24 +81,17 @@
               </div>
             {% endif %}
             {#        Tags#}
-            {% comment %} First, check for the highest priority: a valid 'overriden_tags' list. {% endcomment %}
+            {% with transaction.tags.all as tags %}
-            {% if overriden_tags %}
+              {% if tags %}
-              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
+                <div class="row mb-2 mb-lg-1 tw:text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
+                  <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ overriden_tags|join:", " }}</div>
+                  <div class="col ps-0">{{ tags|join:", " }}</div>
-              </div>
+                </div>
-
+              {% endif %}
-              {% comment %} If no override, fall back to transaction tags, but ONLY if the transaction has an ID. {% endcomment %}
+            {% endwith %}
-            {% elif transaction.id and transaction.tags.all %}
-              <div class="row mb-2 mb-lg-1 tw:text-gray-400">
-                <div class="col-auto pe-1"><i class="fa-solid fa-hashtag fa-fw me-1 fa-xs"></i></div>
-                <div class="col ps-0">{{ transaction.tags.all|join:", " }}</div>
-              </div>
-            {% endif %}
           </div>
         </div>
-        <div
+        <div class="col-lg-auto col-12 text-lg-end align-self-end {% if transaction.category.mute or transaction.mute %}tw:brightness-80{% endif %}">
-            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="main-amount mb-2 mb-lg-0">
             <c-amount.display
                 :amount="transaction.amount"
@@ -117,136 +101,97 @@
                 color="{% if transaction.type == "EX" %}red{% else %}green{% endif %}"></c-amount.display>
           </div>
           {#    Exchange Rate#}
-          {% if not dummy %}
+          {% with exchanged=transaction.exchanged_amount %}
-            {% with exchanged=transaction.exchanged_amount %}
+            {% if exchanged %}
-              {% if exchanged %}
+              <div class="exchanged-amount mb-2 mb-lg-0">
-                <div class="exchanged-amount mb-2 mb-lg-0">
+                <c-amount.display
-                  <c-amount.display
+                    :amount="exchanged.amount"
-                      :amount="exchanged.amount"
+                    :prefix="exchanged.prefix"
-                      :prefix="exchanged.prefix"
+                    :suffix="exchanged.suffix"
-                      :suffix="exchanged.suffix"
+                    :decimal_places="exchanged.decimal_places"
-                      :decimal_places="exchanged.decimal_places"
+                    color="grey"></c-amount.display>
-                      color="grey"></c-amount.display>
+              </div>
-                </div>
+            {% endif %}
-              {% endif %}
+          {% endwith %}
-            {% endwith %}
-          {% endif %}
           <div>
             {% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }}
           </div>
         </div>
-        {% if not dummy %}
+        <div>
-          <div>
+          {#      Item actions#}
-            {#      Item actions#}
+          <div
-            <div
+              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">
-                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-column flex-md-row gap-1">
-              <div class="card-body p-1 shadow-lg d-flex flex-row gap-1">
+              {% if not transaction.deleted %}
-                {% if not transaction.deleted %}
+                <a class="btn btn-secondary btn-sm transaction-action"
-                  <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
-                     role="button"
+                   data-bs-toggle="tooltip"
-                     data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Edit" %}"
-                     data-bs-title="{% translate "Edit" %}"
+                   hx-get="{% url 'transaction_edit' transaction_id=transaction.id %}"
-                     hx-get="{% url 'transaction_edit' transaction_id=transaction.id %}"
+                   hx-target="#generic-offcanvas" hx-swap="innerHTML">
-                     hx-target="#generic-offcanvas" hx-swap="innerHTML">
+                  <i class="fa-solid fa-pencil fa-fw"></i></a>
-                    <i class="fa-solid fa-pencil fa-fw"></i></a>
+                <a class="btn btn-secondary btn-sm transaction-action"
-                  <a class="btn btn-secondary btn-sm transaction-action"
+                   role="button"
-                     role="button"
+                   data-bs-toggle="tooltip"
-                     data-bs-toggle="tooltip"
+                   data-bs-title="{% translate "Delete" %}"
-                     data-bs-title="{% translate "Delete" %}"
+                   hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
-                     hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
+                   hx-trigger='confirmed'
-                     hx-trigger='confirmed'
+                   data-bypass-on-ctrl="true"
-                     data-bypass-on-ctrl="true"
+                   data-title="{% translate "Are you sure?" %}"
-                     data-title="{% translate "Are you sure?" %}"
+                   data-text="{% translate "You won't be able to revert this!" %}"
-                     data-text="{% translate "You won't be able to revert this!" %}"
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
-                     data-confirm-text="{% translate "Yes, delete it!" %}"
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
-                     _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
+                </a>
-                  </a>
+                <button class="btn btn-secondary btn-sm transaction-action" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                  <button class="btn btn-secondary btn-sm transaction-action" type="button" data-bs-toggle="dropdown"
+                  <i class="fa-solid fa-ellipsis fa-fw"></i>
-                          aria-expanded="false">
+                </button>
-                    <i class="fa-solid fa-ellipsis fa-fw"></i>
+                <ul class="dropdown-menu dropdown-menu-end dropdown-menu-md-start">
-                  </button>
+                  {% if transaction.category.mute %}
-                  <ul class="dropdown-menu dropdown-menu-end dropdown-menu-md-start">
+                  <li>
-                    {% if transaction.account.is_untracked_by %}
+                    <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
-                      <li>
+                      <i class="fa-solid fa-eye fa-fw me-2"></i>
-                        <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
+                      <div>
-                          <i class="fa-solid fa-eye fa-fw me-2"></i>
+                        {% translate 'Show on summaries' %}
-                          <div>
+                        <div class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
-                            {% translate 'Show on summaries' %}
+                      </div>
-                            <div
+                    </a>
-                                class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by account' %}</div>
+                  </li>
-                          </div>
+                  {% elif transaction.mute %}
-                        </a>
+                    <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>
-                      </li>
+                  {% else %}
-                    {% elif transaction.category.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-slash fa-fw me-2"></i>{% translate 'Hide from summaries' %}</a></li>
-                      <li>
+                  {% endif %}
-                        <a class="dropdown-item disabled d-flex align-items-center" aria-disabled="true">
+                  <li><a class="dropdown-item" href="#" hx-get="{% url 'quick_transaction_add_as_quick_transaction' transaction_id=transaction.id %}"><i class="fa-solid fa-person-running fa-fw me-2"></i>{% translate 'Add as quick transaction' %}</a></li>
-                          <i class="fa-solid fa-eye fa-fw me-2"></i>
+                  <li><hr class="dropdown-divider"></li>
-                          <div>
+                  <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_change_month' transaction_id=transaction.id change_type='previous' %}"><i class="fa-solid fa-calendar-minus fa-fw me-2"></i>{% translate 'Move to previous month' %}</a></li>
-                            {% translate 'Show on summaries' %}
+                  <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_change_month' transaction_id=transaction.id change_type='next' %}"><i class="fa-solid fa-calendar-plus fa-fw me-2"></i>{% translate 'Move to next month' %}</a></li>
-                            <div
+                  <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_move_to_today' transaction_id=transaction.id %}"><i class="fa-solid fa-calendar-day fa-fw me-2"></i>{% translate 'Move to today' %}</a></li>
-                                class="d-block text-body-secondary tw:text-xs tw:font-medium">{% translate 'Controlled by category' %}</div>
+                  <li><hr class="dropdown-divider"></li>
-                          </div>
+                  <li><a class="dropdown-item" href="#" hx-get="{% url 'transaction_clone' transaction_id=transaction.id %}"><i class="fa-solid fa-clone fa-fw me-2"></i>{% translate 'Duplicate' %}</a></li>
-                        </a>
+                </ul>
-                      </li>
+              {% else %}
-                    {% elif transaction.mute %}
+                <a class="btn btn-secondary btn-sm transaction-action"
-                      <li><a class="dropdown-item" href="#"
+                   role="button"
-                             hx-get="{% url 'transaction_mute' transaction_id=transaction.id %}"
+                   data-bs-toggle="tooltip"
-                             hx-target="closest .transaction" hx-swap="outerHTML"><i
+                   data-bs-title="{% translate "Restore" %}"
-                          class="fa-solid fa-eye fa-fw me-2"></i>{% translate 'Show on summaries' %}</a></li>
+                   hx-get="{% url 'transaction_undelete' transaction_id=transaction.id %}"><i
-                    {% else %}
+                    class="fa-solid fa-trash-arrow-up"></i></a>
-                      <li><a class="dropdown-item" href="#"
+                <a class="btn btn-secondary btn-sm transaction-action"
-                             hx-get="{% url 'transaction_mute' transaction_id=transaction.id %}"
+                   role="button"
-                             hx-target="closest .transaction" hx-swap="outerHTML"><i
+                   data-bs-toggle="tooltip"
-                          class="fa-solid fa-eye-slash fa-fw me-2"></i>{% translate 'Hide from summaries' %}</a></li>
+                   data-bs-title="{% translate "Delete" %}"
-                    {% endif %}
+                   hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
-                    <li><a class="dropdown-item" href="#"
+                   hx-trigger='confirmed'
-                           hx-get="{% url 'quick_transaction_add_as_quick_transaction' transaction_id=transaction.id %}"><i
+                   data-bypass-on-ctrl="true"
-                        class="fa-solid fa-person-running fa-fw me-2"></i>{% translate 'Add as quick transaction' %}</a>
+                   data-title="{% translate "Are you sure?" %}"
-                    </li>
+                   data-text="{% translate "You won't be able to revert this!" %}"
-                    <li>
+                   data-confirm-text="{% translate "Yes, delete it!" %}"
-                      <hr class="dropdown-divider">
+                   _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
-                    </li>
+                </a>
-                    <li><a class="dropdown-item" href="#"
+              {% endif %}
-                           hx-get="{% url 'transaction_change_month' transaction_id=transaction.id change_type='previous' %}"><i
-                        class="fa-solid fa-calendar-minus fa-fw me-2"></i>{% translate 'Move to previous month' %}</a>
-                    </li>
-                    <li><a class="dropdown-item" href="#"
-                           hx-get="{% url 'transaction_change_month' transaction_id=transaction.id change_type='next' %}"><i
-                        class="fa-solid fa-calendar-plus fa-fw me-2"></i>{% translate 'Move to next month' %}</a></li>
-                    <li><a class="dropdown-item" href="#"
-                           hx-get="{% url 'transaction_move_to_today' transaction_id=transaction.id %}"><i
-                        class="fa-solid fa-calendar-day fa-fw me-2"></i>{% translate 'Move to today' %}</a></li>
-                    <li>
-                      <hr class="dropdown-divider">
-                    </li>
-                    <li><a class="dropdown-item" href="#"
-                           hx-get="{% url 'transaction_clone' transaction_id=transaction.id %}"><i
-                        class="fa-solid fa-clone fa-fw me-2"></i>{% translate 'Duplicate' %}</a></li>
-                  </ul>
-                {% else %}
-                  <a class="btn btn-secondary btn-sm transaction-action"
-                     role="button"
-                     data-bs-toggle="tooltip"
-                     data-bs-title="{% translate "Restore" %}"
-                     hx-get="{% url 'transaction_undelete' transaction_id=transaction.id %}"><i
-                      class="fa-solid fa-trash-arrow-up"></i></a>
-                  <a class="btn btn-secondary btn-sm transaction-action"
-                     role="button"
-                     data-bs-toggle="tooltip"
-                     data-bs-title="{% translate "Delete" %}"
-                     hx-delete="{% url 'transaction_delete' transaction_id=transaction.id %}"
-                     hx-trigger='confirmed'
-                     data-bypass-on-ctrl="true"
-                     data-title="{% translate "Are you sure?" %}"
-                     data-text="{% translate "You won't be able to revert this!" %}"
-                     data-confirm-text="{% translate "Yes, delete it!" %}"
-                     _="install prompt_swal"><i class="fa-solid fa-trash fa-fw text-danger"></i>
-                  </a>
-                {% endif %}
-              </div>
             </div>
           </div>
-        {% endif %}
+        </div>
       </div>
     </div>
   </div>

app/templates/currencies/fragments/list.html

@@ -24,7 +24,6 @@
             <th scope="col" class="col-auto"></th>
             <th scope="col" class="col-auto">{% translate 'Code' %}</th>
             <th scope="col" class="col">{% translate 'Name' %}</th>
-            <th scope="col" class="col">{% translate 'Archived' %}</th>
           </tr>
         </thead>
         <tbody>
@@ -54,7 +53,6 @@
             </td>
             <td class="col-auto">{{ currency.code }}</td>
             <td class="col">{{ currency.name }}</td>
-            <td class="col">{% if currency.is_archived %}<i class="fa-solid fa-solid fa-check text-success"></i>{% endif %}</td>
           </tr>
           {% endfor %}
         </tbody>

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/head/favicons.html

@@ -12,4 +12,6 @@
 <link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
 <link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
 <link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
+<meta name="msapplication-TileColor" content="#ffffff">
 <meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
+<meta name="theme-color" content="#ffffff">

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,48 +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 %}"
+    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">
-    id="sidebar-container">
   <nav
       id="sidebar"
       hx-boost="true"
-      hx-swap="transition: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 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="d-none d-lg-flex tw:justify-start p-3 text-decoration-none">
-      <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"/>
-        <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>
-        <span class="fs-4 fw-bold ms-3">WYGIWYH</span>
+    </a>
-      </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>
 
     <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
@@ -144,26 +127,27 @@
            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">
+        <span
-          {% translate 'Management' %}
+            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">
-        </span>
+        {% translate 'Management' %}
-        <i class="fa-solid fa-chevron-right fa-fw ms-auto pe-2"></i>
+      </span>
       </div>
     </ul>
 
     <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 {% 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="show" %}">
+           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 tw:flex tw:flex-col">
+        <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">
+              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 m-0">
+            <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"
@@ -171,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
@@ -277,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">
@@ -289,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">
+          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>
-        <div class="d-flex align-items-center" style="min-width: 0;">
+          <i class="fa-solid fa-circle-user"></i>
-          <i class="fa-solid fa-circle-user text-body-secondary"></i>
+          <strong class="ms-2 tw:lg:invisible tw:lg:group-hover:visible">{{ user.email }}</strong>
-
-          <strong class="mx-2 text-body-secondary text-truncate sidebar-invisible">
-            {{ user.email }}
-          </strong>
         </div>
-
+        <div class="tw:lg:invisible tw:lg:group-hover:visible">
-        <div class="sidebar-invisible">
           {% 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 type="hidden" name="show_tags" value="off">
+        <input class="form-check-input" type="checkbox" role="switch" id="show-tags-switch" name="show_tags"
-          <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 %}>
-                 _="on change trigger updated" {% if show_tags %}checked{% endif %}>
+        {% spaceless %}
-          {% spaceless %}
+          <label class="form-check-label" for="show-tags-switch">
-            <label class="form-check-label" for="show-tags-switch">
+            {% trans 'Tags' %}
-              {% trans 'Tags' %}
+          </label>
-            </label>
+          <c-ui.help-icon
-            <c-ui.help-icon
+              content="{% trans 'Transaction amounts associated with multiple tags will be counted once for each tag' %}"
-                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>
-                icon="fa-solid fa-circle-exclamation"></c-ui.help-icon>
+        {% endspaceless %}
-          {% 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>
       {% endif %}
     </div>
     <div class="btn-group btn-group-sm" role="group" id="showing" _="on change trigger updated">
@@ -265,102 +250,6 @@
                       {% endfor %}
                     </td>
                   </tr>
-                  <!-- Entity rows -->
-                  {% if show_entities %}
-                    {% for entity_id, entity in tag.entities.items %}
-                      {% if entity.name or not entity.name and tag.entities.values|length > 1 %}
-                        <tr class="table-row-nested-2">
-                          <td class="ps-5">
-                            <i class="fa-solid fa-user-group fa-fw me-2 text-muted"></i>{% if entity.name %}{{ entity.name }}{% else %}{% trans 'No entity' %}{% endif %}
-                          </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>
-                      {% endif %}
-                    {% 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">#}
+{#      <div class="col-12 col-xl-8">#}
-      {#        <c-ui.quick-transactions-buttons#}
+{#        <c-ui.quick-transactions-buttons#}
-      {#            :year="year"#}
+{#            :year="year"#}
-      {#            :month="month"#}
+{#            :month="month"#}
-      {#        ></c-ui.quick-transactions-buttons>#}
+{#        ></c-ui.quick-transactions-buttons>#}
-      {#      </div>#}
+{#      </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="row mb-1">
-        <div class="my-3">
+          <div class="col-sm-6 col-12">
-          {# Hidden select to hold the order value and preserve the original update trigger #}
+            {#        Filter transactions button #}
-          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
+            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
-            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
-            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+                    aria-controls="collapse-filter">
-            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
-          </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>
             </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>
-
+          {#        Ordering button#}
-          {# Filter transactions form #}
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
-          <div class="collapse" id="collapse-filter" hx-preserve>
+            <div class="text-sm-end" _="on change trigger updated on window">
-            <div class="card card-body">
+              <label for="order">{% translate "Order by" %}</label>
-              <div class="text-end">
+              <select
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
+                  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"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+                  name="order" id="order">
-              </div>
+                <option value="default"
-
+                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-              <form _="on change or submit or search trigger updated on window
+                <option value="older"
-                         install init_tom_select
+                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-                         install init_datepicker"
+                <option value="newer"
-                    id="filter" class="mt-3">
+                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-                {% crispy filter.form %}
+              </select>
-              </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>
             </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/rules/fragments/list.html

@@ -23,7 +23,6 @@
           <tr>
             <th scope="col" class="col-auto"></th>
             <th scope="col" class="col-auto"></th>
-            <th scope="col" class="col-auto">{% translate 'Order' %}</th>
             <th scope="col" class="col">{% translate 'Name' %}</th>
           </tr>
           </thead>
@@ -81,9 +80,6 @@
                     <i class="fa-solid fa-toggle-off tw:text-red-400"></i>{% endif %}
                 </a>
               </td>
-              <td class="col text-center">
-                <div>{{ rule.order }}</div>
-              </td>
               <td class="col">
                 <div>{{ rule.name }}</div>
                 <div class="tw:text-gray-400">{{ rule.description }}</div>

app/templates/rules/fragments/transaction_rule/dry_run/created.html

@@ -1,16 +0,0 @@
-{% extends 'extends/offcanvas.html' %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block title %}{% trans 'Test' %} - {% trans 'Create' %}{% endblock %}
-
-{% block body %}
-  <form hx-post="{% url 'transaction_rule_dry_run_created' pk=rule.id %}" hx-target="#generic-offcanvas"
-        hx-indicator="#dry-run-created-result, closest form" class="show-loading" novalidate>
-    {% crispy form %}
-  </form>
-  <hr>
-  <div id="dry-run-created-result" class="show-loading">
-    {% include 'rules/fragments/transaction_rule/dry_run/visual.html' with logs=logs results=results %}
-  </div>
-{% endblock %}

app/templates/rules/fragments/transaction_rule/dry_run/deleted.html

@@ -1,16 +0,0 @@
-{% extends 'extends/offcanvas.html' %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block title %}{% trans 'Test' %} - {% trans 'Delete' %}{% endblock %}
-
-{% block body %}
-  <form hx-post="{% url 'transaction_rule_dry_run_deleted' pk=rule.id %}" hx-target="#generic-offcanvas"
-        hx-indicator="#dry-run-deleted-result, closest form" class="show-loading" novalidate>
-    {% crispy form %}
-  </form>
-  <hr>
-  <div id="dry-run-deleted-result" class="show-loading">
-    {% include 'rules/fragments/transaction_rule/dry_run/visual.html' with logs=logs results=results %}
-  </div>
-{% endblock %}

app/templates/rules/fragments/transaction_rule/dry_run/updated.html

@@ -1,16 +0,0 @@
-{% extends 'extends/offcanvas.html' %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block title %}{% trans 'Test' %} - {% trans 'Update' %}{% endblock %}
-
-{% block body %}
-  <form hx-post="{% url 'transaction_rule_dry_run_updated' pk=rule.id %}" hx-target="#generic-offcanvas"
-        hx-indicator="#dry-run-updated-result, closest form" class="show-loading" novalidate>
-    {% crispy form %}
-  </form>
-  <hr>
-  <div id="dry-run-updated-result" class="show-loading">
-    {% include 'rules/fragments/transaction_rule/dry_run/visual.html' with logs=logs results=results %}
-  </div>
-{% endblock %}

app/templates/rules/fragments/transaction_rule/dry_run/visual.html

@@ -1,101 +0,0 @@
-{% load i18n %}
-<div class="card tw:max-h-full tw:overflow-auto tw:overflow-x-auto">
-  <div class="card-header">
-    <ul class="nav nav-tabs card-header-tabs">
-      <li class="nav-item">
-        <button class="nav-link active" id="visual-tab" data-bs-toggle="tab" data-bs-target="#visual-tab-pane"
-                type="button" role="tab" aria-controls="visual-tab-pane"
-                aria-selected="true">{% translate 'Visual' %}</button>
-      </li>
-      <li class="nav-item" role="presentation">
-        <button class="nav-link" id="logs-tab" data-bs-toggle="tab" data-bs-target="#logs-tab-pane" type="button"
-                role="tab" aria-controls="logs-tab-pane" aria-selected="false">{% translate 'Logs' %}</button>
-      </li>
-    </ul>
-  </div>
-  <div class="card-body">
-    <div class="tab-content" id="myTabContent">
-      <div class="tab-pane fade show active" id="visual-tab-pane" role="tabpanel" aria-labelledby="home-tab"
-           tabindex="0">
-        {% if not results %}
-          {% translate 'Run a test to see...' %}
-        {% else %}
-          {% for result in results %}
-
-            {% if result.type == 'header' %}
-              <div class="my-3">
-                <h6 class="text-center mb-3">
-                  <span class="badge text-bg-secondary">
-                  {% if result.header_type == "edit_transaction" %}
-                    {% translate 'Edit transaction' %}
-                  {% elif result.header_type == "update_or_create_transaction" %}
-                    {% translate 'Update or create transaction' %}
-                  {% endif %}
-                  </span>
-                </h6>
-              </div>
-            {% endif %}
-
-
-            {% if result.type == 'triggering_transaction' %}
-              <div class="mt-4">
-                <h6 class="text-center mb-3"><span class="badge text-bg-secondary">{% translate 'Start' %}</span></h6>
-                <c-transaction.item :transaction="result.transaction" :dummy="True"
-                                    :disable-selection="True"></c-transaction.item>
-              </div>
-            {% endif %}
-
-            {% if result.type == 'edit_transaction' %}
-              <div>
-                <div>
-                  {% translate 'Set' %} <span
-                    class="badge text-bg-secondary">{{ result.field }}</span> {% translate 'to' %}
-                  <span class="badge text-bg-secondary">{{ result.new_value }}</span>
-                </div>
-                <c-transaction.item :transaction="result.transaction" :dummy="True"
-                                    :disable-selection="True"></c-transaction.item>
-              </div>
-            {% endif %}
-
-            {% if result.type == 'update_or_create_transaction' %}
-              <div>
-                <div class="alert alert-info" role="alert">
-                  {% translate 'Search' %}: {{ result.query }}
-                </div>
-                {% if result.start_transaction %}
-                  <c-transaction.item :transaction="result.start_transaction" :dummy="True"
-                                      :disable-selection="True"></c-transaction.item>
-                {% else %}
-                  <div class="alert alert-danger" role="alert">
-                    {% translate 'No transaction found, a new one will be created' %}
-                  </div>
-                {% endif %}
-                <div class="text-center h3 my-2"><i class="fa-solid fa-arrow-down"></i></div>
-                <c-transaction.item :transaction="result.end_transaction" :dummy="True"
-                                    :disable-selection="True"></c-transaction.item>
-              </div>
-            {% endif %}
-
-            {% if result.type == 'error' %}
-              <div>
-                <div class="alert alert-{% if result.level == 'error' %}danger{% elif result.level == 'warning' %}warning{% else %}info{% endif %}" role="alert">
-                  {{ result.error }}
-                </div>
-              </div>
-            {% endif %}
-
-          {% endfor %}
-        {% endif %}
-      </div>
-      <div class="tab-pane fade" id="logs-tab-pane" role="tabpanel" aria-labelledby="logs-tab" tabindex="0">
-        {% if not logs %}
-          {% translate 'Run a test to see...' %}
-        {% else %}
-          <pre>
-              {{ logs|linebreaks }}
-            </pre>
-        {% endif %}
-      </div>
-    </div>
-  </div>
-</div>

app/templates/rules/fragments/transaction_rule/view.html

@@ -30,128 +30,95 @@
 
     <div class="my-3">
       <div class="tw:text-xl mb-2">{% translate 'Then...' %}</div>
-      {% for action in all_actions %}
+      {% for action in transaction_rule.transaction_actions.all %}
-        {% if action.action_type == "edit_transaction" %}
+        <div class="card mb-3">
-          <div class="card mb-3">
+          <div class="card-header">
-            <div class="card-header">
+            <div><span class="badge text-bg-primary">{% trans 'Edit transaction' %}</span></div>
-              <div>
-                {% if action.order != 0 %}<span class="badge text-bg-secondary">{{ action.order }}</span>{% endif %}
-                <span class="badge text-bg-primary">{% trans 'Edit transaction' %}</span>
-              </div>
-            </div>
-            <div class="card-body">
-              <div>
-                {% translate 'Set' %} <span
-                  class="badge text-bg-secondary">{{ action.get_field_display }}</span> {% translate 'to' %}
-              </div>
-              <div class="text-bg-secondary rounded-3 mt-3 p-2">{{ action.value }}</div>
-            </div>
-            <div class="card-footer text-end">
-              <a class="text-decoration-none tw:text-gray-400 p-1"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate 'Edit' %}"
-                 hx-get="{% url 'transaction_rule_action_edit' transaction_rule_action_id=action.id %}"
-                 hx-target="#generic-offcanvas">
-                <i class="fa-solid fa-pencil fa-fw"></i>
-              </a>
-              <a class="text-danger text-decoration-none p-1"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate 'Delete' %}"
-                 hx-delete="{% url 'transaction_rule_action_delete' transaction_rule_action_id=action.id %}"
-                 hx-trigger='confirmed'
-                 data-bypass-on-ctrl="true"
-                 data-title="{% translate 'Are you sure?' %}"
-                 data-text="{% translate "You won't be able to revert this!" %}"
-                 data-confirm-text="{% translate 'Yes, delete it!' %}"
-                 _="install prompt_swal">
-                <i class="fa-solid fa-trash fa-fw"></i>
-              </a>
-            </div>
           </div>
-        {% elif action.action_type == "update_or_create_transaction" %}
+          <div class="card-body">
-          <div class="card mb-3">
+            <div>{% translate 'Set' %} <span
-            <div class="card-header">
+                class="badge text-bg-secondary">{{ action.get_field_display }}</span> {% translate 'to' %}</div>
-              <div>
+            <div class="text-bg-secondary rounded-3 mt-3 p-2">{{ action.value }}</div>
-                {% if action.order != 0 %}<span class="badge text-bg-secondary">{{ action.order }}</span>{% endif %}
-                <span class="badge text-bg-primary">{% trans 'Update or create transaction' %}</span>
-              </div>
-            </div>
-            <div class="card-body">
-              <div>{% trans 'Edit to view' %}</div>
-            </div>
-            <div class="card-footer text-end">
-              <a class="text-decoration-none tw:text-gray-400 p-1"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate 'Edit' %}"
-                 hx-get="{% url 'update_or_create_transaction_rule_action_edit' pk=action.id %}"
-                 hx-target="#generic-offcanvas">
-                <i class="fa-solid fa-pencil fa-fw"></i>
-              </a>
-              <a class="text-danger text-decoration-none p-1"
-                 role="button"
-                 data-bs-toggle="tooltip"
-                 data-bs-title="{% translate 'Delete' %}"
-                 hx-delete="{% url 'update_or_create_transaction_rule_action_delete' pk=action.id %}"
-                 hx-trigger='confirmed'
-                 data-bypass-on-ctrl="true"
-                 data-title="{% translate 'Are you sure?' %}"
-                 data-text="{% translate "You won't be able to revert this!" %}"
-                 data-confirm-text="{% translate 'Yes, delete it!' %}"
-                 _="install prompt_swal">
-                <i class="fa-solid fa-trash fa-fw"></i>
-              </a>
-            </div>
           </div>
-        {% endif %}
+          <div class="card-footer text-end">
-      {% empty %}
+            <a class="text-decoration-none tw:text-gray-400 p-1"
+               role="button"
+               data-bs-toggle="tooltip"
+               data-bs-title="{% translate "Edit" %}"
+               hx-get="{% url 'transaction_rule_action_edit' transaction_rule_action_id=action.id %}"
+               hx-target="#generic-offcanvas">
+              <i class="fa-solid fa-pencil fa-fw"></i>
+            </a>
+            <a class="text-danger text-decoration-none p-1"
+               role="button"
+               data-bs-toggle="tooltip"
+               data-bs-title="{% translate "Delete" %}"
+               hx-delete="{% url 'transaction_rule_action_delete' transaction_rule_action_id=action.id %}"
+               hx-trigger='confirmed'
+               data-bypass-on-ctrl="true"
+               data-title="{% translate "Are you sure?" %}"
+               data-text="{% translate "You won't be able to revert this!" %}"
+               data-confirm-text="{% translate "Yes, delete it!" %}"
+               _="install prompt_swal">
+              <i class="fa-solid fa-trash fa-fw"></i>
+            </a>
+          </div>
+        </div>
+      {% endfor %}
+      {% for action in transaction_rule.update_or_create_transaction_actions.all %}
+        <div class="card mb-3">
+          <div class="card-header">
+            <div><span class="badge text-bg-primary">{% trans 'Update or create transaction' %}</span></div>
+          </div>
+          <div class="card-body">
+            <div>{% trans 'Edit to view' %}</div>
+          </div>
+          <div class="card-footer text-end">
+            <a class="text-decoration-none tw:text-gray-400 p-1"
+               role="button"
+               data-bs-toggle="tooltip"
+               data-bs-title="{% translate "Edit" %}"
+               hx-get="{% url 'update_or_create_transaction_rule_action_edit' pk=action.id %}"
+               hx-target="#generic-offcanvas">
+              <i class="fa-solid fa-pencil fa-fw"></i>
+            </a>
+            <a class="text-danger text-decoration-none p-1"
+               role="button"
+               data-bs-toggle="tooltip"
+               data-bs-title="{% translate "Delete" %}"
+               hx-delete="{% url 'update_or_create_transaction_rule_action_delete' pk=action.id %}"
+               hx-trigger='confirmed'
+               data-bypass-on-ctrl="true"
+               data-title="{% translate "Are you sure?" %}"
+               data-text="{% translate "You won't be able to revert this!" %}"
+               data-confirm-text="{% translate "Yes, delete it!" %}"
+               _="install prompt_swal">
+              <i class="fa-solid fa-trash fa-fw"></i>
+            </a>
+          </div>
+        </div>
+      {% endfor %}
+      {% if not transaction_rule.update_or_create_transaction_actions.all and not transaction_rule.transaction_actions.all %}
         <div class="card">
           <div class="card-body">
             {% translate 'This rule has no actions' %}
           </div>
         </div>
-      {% endfor %}
+      {% endif %}
       <hr>
-      <div class="d-grid d-lg-flex gap-2">
+      <div class="dropdown">
-        <div class="dropdown flex-fill">
+        <button class="btn btn-outline-primary text-decoration-none w-100" type="button" data-bs-toggle="dropdown"
-          <button class="btn btn-outline-primary text-decoration-none w-100" type="button" data-bs-toggle="dropdown"
+                aria-expanded="false">
-                  aria-expanded="false">
+          <i class="fa-solid fa-circle-plus me-2"></i>{% translate 'Add new' %}
-            <i class="fa-solid fa-flask-vial me-2"></i>{% translate 'Test' %}
+        </button>
-          </button>
+        <ul class="dropdown-menu dropdown-menu-end w-100">
-          <ul class="dropdown-menu">
+          <li><a class="dropdown-item" role="link"
-            {% if transaction_rule.on_create %}
+                 hx-get="{% url 'transaction_rule_action_add' transaction_rule_id=transaction_rule.id %}"
-              <li><a class="dropdown-item" role="link" href="#"
+                 hx-target="#generic-offcanvas">{% trans 'Edit Transaction' %}</a></li>
-                     hx-get="{% url 'transaction_rule_dry_run_created' pk=transaction_rule.id %}"
+          <li><a class="dropdown-item" role="link"
-                     hx-target="#generic-offcanvas">{% trans 'Create' %}</a></li>
+                 hx-get="{% url 'update_or_create_transaction_rule_action_add' transaction_rule_id=transaction_rule.id %}"
-            {% endif %}
+                 hx-target="#generic-offcanvas">{% trans 'Update or Create Transaction' %}</a></li>
-            {% if transaction_rule.on_update %}
+        </ul>
-              <li><a class="dropdown-item" role="link" href="#"
-                     hx-get="{% url 'transaction_rule_dry_run_updated' pk=transaction_rule.id %}"
-                     hx-target="#generic-offcanvas">{% trans 'Update' %}</a></li>
-            {% endif %}
-            {% if transaction_rule.on_delete %}
-              <li><a class="dropdown-item" role="link" href="#"
-                     hx-get="{% url 'transaction_rule_dry_run_deleted' pk=transaction_rule.id %}"
-                     hx-target="#generic-offcanvas">{% trans 'Delete' %}</a></li>
-            {% endif %}
-          </ul>
-        </div>
-        <div class="dropdown flex-fill">
-          <button class="btn btn-outline-primary text-decoration-none w-100" type="button" data-bs-toggle="dropdown"
-                  aria-expanded="false">
-            <i class="fa-solid fa-circle-plus me-2"></i>{% translate 'Add new' %}
-          </button>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" role="link" href="#"
-                   hx-get="{% url 'transaction_rule_action_add' transaction_rule_id=transaction_rule.id %}"
-                   hx-target="#generic-offcanvas">{% trans 'Edit Transaction' %}</a></li>
-            <li><a class="dropdown-item" role="link" href="#"
-                   hx-get="{% url 'update_or_create_transaction_rule_action_add' transaction_rule_id=transaction_rule.id %}"
-                   hx-target="#generic-offcanvas">{% trans 'Update or Create Transaction' %}</a></li>
-          </ul>
-        </div>
       </div>
     </div>
   </div>

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"
+    <div id="{{ x.grouper|slugify }}"
-         _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
+         _="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 transactions-divider-title">
+      <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
+                end">
-                  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">
         <div class="d-flex flex-column">
         {% for transaction in x.list %}
-          <c-transaction.item
+          <c-transaction.item :transaction="transaction"></c-transaction.item>
-            :transaction="transaction"></c-transaction.item>
         {% endfor %}
         </div>
       </div>
     </div>
   {% empty %}
     <c-msg.empty
-        title="{% translate "No transactions found" %}"
+      title="{% translate "No transactions found" %}"
-        subtitle="{% translate "Try adding one" %}"></c-msg.empty>
+      subtitle="{% translate "Try adding one" %}"></c-msg.empty>
-  {% endfor %}
+{% endfor %}
 
   {% if page_obj.has_other_pages %}
-    <div class="mt-auto">
+  <div class="mt-auto">
-      <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
+    <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
 
-      <nav aria-label="{% translate 'Page navigation' %}">
+    <nav aria-label="{% translate 'Page navigation' %}">
-        <ul class="pagination justify-content-center mt-5">
+    <ul class="pagination justify-content-center mt-5">
-          <li class="page-item">
+      <li class="page-item">
-            <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+        <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-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
-               hx-vals='{"page": 1}'
+           hx-vals='{"page": 1}'
-               hx-include="#filter, #order"
+           hx-include="#filter, #order"
-               hx-target="#transactions-list"
+           hx-target="#transactions-list"
-               aria-label="Primeira página"
+           aria-label="Primeira página"
-               hx-swap="show:top">
+           hx-swap="show:top">
-              <span aria-hidden="true">&laquo;</span>
+          <span aria-hidden="true">&laquo;</span>
-            </a>
+        </a>
-          </li>
+      </li>
-          {% for page_number in page_obj.paginator.page_range %}
+      {% for page_number in page_obj.paginator.page_range %}
-            {% comment %}
+              {% 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_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
-              {% if page_obj.number == page_number %}
+                  {% if page_obj.number == page_number %}
-                <li class="page-item active">
+                      <li class="page-item active">
-                  <a class="page-link tw:cursor-pointer">
+                          <a class="page-link tw:cursor-pointer">
-                    {{ page_number }}
+                              {{ page_number }}
-                  </a>
+                          </a>
-                </li>
+                      </li>
-              {% else %}
+                  {% else %}
-                <li class="page-item">
+                      <li class="page-item">
-                  <a class="page-link tw:cursor-pointer"
+                          <a class="page-link tw:cursor-pointer"
-                     hx-get="{% url 'transactions_all_list' %}"
+                             hx-get="{% url 'transactions_all_list' %}"
-                     hx-vals='{"page": {{ page_number }}}'
+                             hx-vals='{"page": {{ page_number }}}'
-                     hx-include="#filter, #order"
+                             hx-include="#filter, #order"
-                     hx-target="#transactions-list"
+                             hx-target="#transactions-list"
-                     hx-swap="show:top">
+                             hx-swap="show:top">
-                    {{ page_number }}
+                              {{ page_number }}
-                  </a>
+                          </a>
-                </li>
+                      </li>
+                  {% endif %}
               {% endif %}
-            {% endif %}
+      {% endfor %}
-          {% endfor %}
+      {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
-          {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
+        <li class="page-item">
-            <li class="page-item">
+          <a class="page-link disabled"
-              <a class="page-link disabled"
+             aria-label="...">
-                 aria-label="...">
+            <span aria-hidden="true">...</span>
-                <span aria-hidden="true">...</span>
+          </a>
-              </a>
+        </li>
-            </li>
+        <li class="page-item">
-            <li class="page-item">
+          <a class="page-link tw:cursor-pointer"
-              <a class="page-link tw:cursor-pointer"
+             hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
-                 hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
+             hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-                 hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+             hx-include="#filter, #order"
-                 hx-include="#filter, #order"
+             hx-swap="show:top"
-                 hx-swap="show:top"
+             aria-label="Última página">
-                 aria-label="Última página">
+            <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
-                <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
+          </a>
-              </a>
+        </li>
-            </li>
+      {% endif %}
-          {% endif %}
+      <li class="page-item">
-          <li class="page-item">
+        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
-            <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-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
+           hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-               hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+           hx-include="#filter, #order"
-               hx-include="#filter, #order"
+           hx-swap="show:top"
-               hx-swap="show:top"
+           hx-target="#transactions-list"
-               hx-target="#transactions-list"
+           aria-label="Next">
-               aria-label="Next">
+          <span aria-hidden="true">&raquo;</span>
-              <span aria-hidden="true">&raquo;</span>
+        </a>
-            </a>
+      </li>
-          </li>
+    </ul>
-        </ul>
+  </nav>
-      </nav>
+  </div>
-    </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">
+        <div class="row mb-1">
-          {# Hidden select to hold the order value and preserve the original update trigger #}
+          <div class="col-sm-6 col-12">
-          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
+            {#        Filter transactions button #}
-            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
-            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
-            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+                    aria-controls="collapse-filter">
-          </select>
+              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
-
-          {# 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>
             </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>
-
+          {#        Ordering button#}
-          {# Filter transactions form #}
+          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
-          <div class="collapse" id="collapse-filter" hx-preserve>
+            <div class="text-sm-end" _="on change trigger updated on window">
-            <div class="card card-body">
+              <label for="order">{% translate "Order by" %}</label>
-              <div class="text-end">
+              <select
-                <button class="btn btn-outline-danger btn-sm tw:w-fit"
+                  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"
-                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+                  name="order" id="order">
-              </div>
+                <option value="default"
-
+                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-              <form _="on change or submit or search trigger updated on window
+                <option value="older"
-                         install init_tom_select
+                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-                         install init_datepicker"
+                <option value="newer"
-                    id="filter" class="mt-3">
+                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-                {% crispy filter.form %}
+              </select>
-              </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>
             </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>

docker-compose.dev.yml

@@ -15,7 +15,7 @@ services:
       - ./frontend/:/usr/src/frontend:z
       - wygiwyh_temp:/usr/src/app/temp/
     ports:
-      - "${OUTBOUND_PORT:-8000}:${INTERNAL_PORT:-8000}"
+      - "${OUTBOUND_PORT}:8000"
     env_file:
       - .env
     depends_on:

docker-compose.prod.yml

@@ -4,7 +4,7 @@ services:
     container_name: ${SERVER_NAME}
     command: /start-single
     ports:
-      - "${OUTBOUND_PORT:-8000}:${INTERNAL_PORT:-8000}"
+      - "${OUTBOUND_PORT}:8000"
     env_file:
       - .env
     depends_on:

docker/dev/django/start

@@ -4,9 +4,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-# Set INTERNAL_PORT with default value of 8000
-INTERNAL_PORT=${INTERNAL_PORT:-8000}
-
 rm -f /tmp/migrations_complete
 
 python manage.py migrate
@@ -16,4 +13,4 @@ touch /tmp/migrations_complete
 
 python manage.py setup_users
 
-exec python manage.py runserver 0.0.0.0:$INTERNAL_PORT
+exec python manage.py runserver 0.0.0.0:8000

docker/prod/django/start

@@ -4,9 +4,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-# Set INTERNAL_PORT with default value of 8000
-INTERNAL_PORT=${INTERNAL_PORT:-8000}
-
 # Remove flag file if it exists from previous run
 rm -f /tmp/migrations_complete
 
@@ -18,4 +15,4 @@ touch /tmp/migrations_complete
 
 python manage.py setup_users
 
-exec gunicorn WYGIWYH.wsgi:application --bind 0.0.0.0:$INTERNAL_PORT --timeout 600
+exec gunicorn WYGIWYH.wsgi:application --bind 0.0.0.0:8000 --timeout 600

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;
-    }
-}