Merge pull request #12229 from firefly-iii/release-1778308665

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2026-05-09
2026-05-25 02:13:45 +00:00 · 2026-05-09 08:37:52 +02:00 · 2026-05-09 08:37:45 +02:00 · 2026-05-09 08:32:43 +02:00 · 2026-05-09 08:32:08 +02:00 · 2026-05-09 08:27:14 +02:00
22 changed files with 370 additions and 262 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -294,42 +294,42 @@
        },
        {
            "name": "ergebnis/agent-detector",
-            "version": "1.1.1",
+            "version": "1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ergebnis/agent-detector.git",
-                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64"
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
-                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/e211f17928c8b95a51e06040792d57f5462fb271",
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271",
                "shasum": ""
            },
            "require": {
                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
            },
            "require-dev": {
-                "ergebnis/composer-normalize": "^2.50.0",
+                "ergebnis/composer-normalize": "^2.51.0",
                "ergebnis/license": "^2.7.0",
                "ergebnis/php-cs-fixer-config": "^6.60.2",
                "ergebnis/phpstan-rules": "^2.13.1",
                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
-                "ergebnis/rector-rules": "^1.16.0",
+                "ergebnis/rector-rules": "^1.18.1",
                "fakerphp/faker": "^1.24.1",
                "infection/infection": "^0.26.6",
                "phpstan/extension-installer": "^1.4.3",
-                "phpstan/phpstan": "^2.1.46",
+                "phpstan/phpstan": "^2.1.54",
                "phpstan/phpstan-deprecation-rules": "^2.0.4",
                "phpstan/phpstan-phpunit": "^2.0.16",
                "phpstan/phpstan-strict-rules": "^2.0.10",
                "phpunit/phpunit": "^9.6.34",
-                "rector/rector": "^2.4.1"
+                "rector/rector": "^2.4.2"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.0-dev"
+                    "dev-main": "1.2-dev"
                },
                "composer-normalize": {
                    "indent-size": 2,
@@ -359,7 +359,7 @@
                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
                "source": "https://github.com/ergebnis/agent-detector"
            },
-            "time": "2026-04-10T13:45:13+00:00"
+            "time": "2026-05-07T08:19:07+00:00"
        },
        {
            "name": "evenement/evenement",
@@ -1424,16 +1424,16 @@
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b",
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b",
                "shasum": ""
            },
            "require": {
@@ -1446,7 +1446,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -1471,7 +1471,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -1482,12 +1482,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-04-13T15:52:40+00:00"
        },
        {
            "name": "symfony/event-dispatcher",
@@ -1576,16 +1580,16 @@
        },
        {
            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32",
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32",
                "shasum": ""
            },
            "require": {
@@ -1599,7 +1603,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -1632,7 +1636,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -1643,12 +1647,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
        },
        {
            "name": "symfony/filesystem",
@@ -2505,16 +2513,16 @@
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.6.1",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
                "shasum": ""
            },
            "require": {
@@ -2532,7 +2540,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -2568,7 +2576,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -2588,7 +2596,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:30:57+00:00"
+            "time": "2026-03-28T09:44:51+00:00"
        },
        {
            "name": "symfony/stopwatch",
--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -1,3 +1,5 @@
-# [Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)
+# Contributing guidelines

-[Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)
+This repository is part of "Firefly III", by being either a main repository for code, a supporting repository with guidelines and documentation, or a repository with tools and secondary code.
+
+The [contribution guidelines](https://docs.firefly-iii.org/explanation/contributing/) for this repository are the same as they are for ALL Firefly III related repositories, and they can be found in [the Firefly III documentation](https://docs.firefly-iii.org/explanation/contributing/).
--- a/app/Api/V1/Controllers/Insight/Income/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php
@@ -158,7 +158,10 @@ final class TagController extends Controller
                        'currency_id'      => (string) $foreignCurrencyId,
                        'currency_code'    => $journal['foreign_currency_code'],
                    ];
-                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
+                    $response[$foreignKey]['difference']       = bcadd(
+                        (string) $response[$foreignKey]['difference'],
+                        Steam::positive($journal['foreign_amount'])
+                    );
                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                }
            }
--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php
+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php
@@ -155,7 +155,10 @@ final class TagController extends Controller
                        'currency_id'      => (string) $foreignCurrencyId,
                        'currency_code'    => $journal['foreign_currency_code'],
                    ];
-                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
+                    $response[$foreignKey]['difference']       = bcadd(
+                        (string) $response[$foreignKey]['difference'],
+                        Steam::positive($journal['foreign_amount'])
+                    );
                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                }
            }
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -255,7 +255,10 @@ final class IndexController extends Controller
                    if (count($bill['paid_dates']) < count($bill['pay_dates'])) {
                        $count = count($bill['pay_dates']) - count($bill['paid_dates']);
                        if ($count > 0) {
-                            $avg                                                 = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
+                            $avg                                                 = bcdiv(
+                                bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),
+                                '2'
+                            );
                            $avg                                                 = bcmul($avg, (string) $count);
                            $sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);
                            Log::debug(
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -198,7 +198,13 @@ final class BudgetLimitController extends Controller
        if ($request->expectsJson()) {
            $array                           = $limit->toArray();
            // add some extra metadata:
-            $spentArr                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
+            $spentArr                        = $this->opsRepository->sumExpenses(
+                $limit->start_date,
+                $limit->end_date,
+                null,
+                new Collection()->push($budget),
+                $currency
+            );
            $array['spent']                  = $spentArr[$currency->id]['sum'] ?? '0';
            $array['left_formatted']         = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
            $array['amount_formatted']       = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -245,13 +245,8 @@ final class IndexController extends Controller
                $inPast                       = $limitPeriod->startsBefore(now()) && $limitPeriod->endsBefore(now());
                $currency                     = $limit->transactionCurrency ?? $primaryCurrency;
                $amount                       = Steam::bcround($limit->amount, $currency->decimal_places);
-                $spent                        = $this->opsRepository->sumExpenses(
-                    $limit->start_date,
-                    $limit->end_date,
-                    null,
-                    new Collection()->push($budget),
-                    $currency
-                );
+                $spent                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
+
                $spentAmount                  = $spent[$currency->id]['sum'] ?? '0';
                $array['budgeted'][]          = [
                    'id'                      => $limit->id,
@@ -289,7 +284,10 @@ final class IndexController extends Controller

                if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                    $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
-                    $array['spent'][$currency->id]['spent_outside']           = bcmul(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']), '-1');
+                    $array['spent'][$currency->id]['spent_outside']           = Steam::negative(bcsub(
+                        $spentInLimits[$currency->id],
+                        $spentArr[$currency->id]['sum']
+                    ));
                    $array['spent'][$currency->id]['currency_id']             = $currency->id;
                    $array['spent'][$currency->id]['currency_symbol']         = $currency->symbol;
                    $array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -539,7 +539,13 @@ final class BudgetController extends Controller
            }

            // get spent amount in this period for this currency.
-            $sum                             = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
+            $sum                             = $this->opsRepository->sumExpenses(
+                $currentStart,
+                $currentEnd,
+                $accounts,
+                new Collection()->push($budget),
+                $currency
+            );
            $amount                          = Steam::positive($sum[$currency->id]['sum'] ?? '0');
            $chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);

--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -284,7 +284,7 @@ final class BudgetController extends Controller
        $cache->addProperty('budget-period-report');
        $cache->addProperty($accounts->pluck('id')->toArray());
        if ($cache->has()) {
-            return $cache->get();
+            // return $cache->get();
        }

        $periods   = Navigation::listOfPeriods($start, $end);
@@ -292,7 +292,6 @@ final class BudgetController extends Controller

        // list expenses for budgets in account(s)
        $expenses  = $this->opsRepository->listExpenses($start, $end, $accounts);
-
        $report    = [];
        foreach ($expenses as $currency) {
            foreach ($currency['budgets'] as $budget) {
@@ -300,9 +299,12 @@ final class BudgetController extends Controller
                foreach ($budget['transaction_journals'] as $journal) {
                    // #10678
                    // skip transactions between two asset / liability accounts.
+                    // #12223
+                    // must also be of the same type to be skipped
                    if (
                        in_array($journal['source_account_type'], config('firefly.valid_currency_account_types'), true)
                        && in_array($journal['destination_account_type'], config('firefly.valid_currency_account_types'), true)
+                        && $journal['source_account_type'] === $journal['destination_account_type']
                    ) {
                        continue;
                    }
--- a/app/Jobs/CreateAutoBudgetLimits.php
+++ b/app/Jobs/CreateAutoBudgetLimits.php
@@ -122,7 +122,13 @@ class CreateAutoBudgetLimits implements ShouldQueue
        // if has one, calculate expenses and use that as a base.
        $repository      = app(OperationsRepositoryInterface::class);
        $repository->setUser($autoBudget->budget->user);
-        $spent           = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
+        $spent           = $repository->sumExpenses(
+            $previousStart,
+            $previousEnd,
+            null,
+            new Collection()->push($autoBudget->budget),
+            $autoBudget->transactionCurrency
+        );
        $currencyId      = $autoBudget->transaction_currency_id;
        $spentAmount     = $spent[$currencyId]['sum'] ?? '0';
        Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -212,7 +218,13 @@ class CreateAutoBudgetLimits implements ShouldQueue
        // if has one, calculate expenses and use that as a base.
        $repository    = app(OperationsRepositoryInterface::class);
        $repository->setUser($autoBudget->budget->user);
-        $spent         = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
+        $spent         = $repository->sumExpenses(
+            $previousStart,
+            $previousEnd,
+            null,
+            new Collection()->push($autoBudget->budget),
+            $autoBudget->transactionCurrency
+        );
        $currencyId    = $autoBudget->transaction_currency_id;
        $spentAmount   = $spent[$currencyId]['sum'] ?? '0';
        Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
--- a/app/Repositories/Budget/BudgetLimitRepository.php
+++ b/app/Repositories/Budget/BudgetLimitRepository.php
@@ -335,7 +335,9 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface, UserGroup
        $limit                          = new BudgetLimit();
        $limit->budget()->associate($budget);
        $limit->start_date              = $data['start_date']->format('Y-m-d');
+        $limit->start_date_tz           = $data['start_date']->format('e');
        $limit->end_date                = $data['end_date']->format('Y-m-d');
+        $limit->end_date_tz             = $data['end_date']->format('e');
        $limit->amount                  = $data['amount'];
        $limit->generated               = $data['generated'] ?? false;
        $limit->period                  = $data['period'] ?? '';
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -222,7 +222,14 @@ trait AugumentData
                $currentEnd->addMonth();
            }
            // primary currency amount.
-            $expenses        = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);
+            $expenses        = $opsRepository->sumExpenses(
+                $currentStart,
+                $currentEnd,
+                null,
+                $budgetCollection,
+                $entry->transactionCurrency,
+                $this->convertToPrimary
+            );
            $spent           = $expenses[$currency->id]['sum'] ?? '0';
            $entry->pc_spent = $spent;

--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -354,7 +354,10 @@ class RecurringEnrichment implements EnrichmentInterface

        /** @var RecurrenceRepetition $repetition */
        foreach ($set as $repetition) {
-            $recurrence                               = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();
+            $recurrence                               = $this->collection
+                ->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)
+                ->first()
+            ;
            $fromDate                                 = clone ($recurrence->latest_date ?? $recurrence->first_date);
            $recurrenceId                             = (int) $repetition->recurrence_id;
            $repId                                    = (int) $repetition->id;
--- a/composer.lock
+++ b/composer.lock
@@ -1879,16 +1879,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v13.7.0",
+            "version": "v13.8.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "f13b85b2cce7ef5e8f3bcdf2b6c6364bbdedae0b"
+                "reference": "e7db333a025a1e93ebca7744953069d7719f4bcf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f13b85b2cce7ef5e8f3bcdf2b6c6364bbdedae0b",
-                "reference": "f13b85b2cce7ef5e8f3bcdf2b6c6364bbdedae0b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e7db333a025a1e93ebca7744953069d7719f4bcf",
+                "reference": "e7db333a025a1e93ebca7744953069d7719f4bcf",
                "shasum": ""
            },
            "require": {
@@ -1929,8 +1929,8 @@
                "symfony/http-kernel": "^7.4.0 || ^8.0.0",
                "symfony/mailer": "^7.4.0 || ^8.0.0",
                "symfony/mime": "^7.4.0 || ^8.0.0",
-                "symfony/polyfill-php84": "^1.33",
-                "symfony/polyfill-php85": "^1.33",
+                "symfony/polyfill-php84": "^1.36",
+                "symfony/polyfill-php85": "^1.36",
                "symfony/polyfill-php86": "^1.36",
                "symfony/process": "^7.4.5 || ^8.0.5",
                "symfony/routing": "^7.4.0 || ^8.0.0",
@@ -2099,7 +2099,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2026-04-28T17:18:25+00:00"
+            "time": "2026-05-05T21:01:14+00:00"
        },
        {
            "name": "laravel/passport",
@@ -4939,27 +4939,28 @@
        },
        {
            "name": "pragmarx/google2fa-qrcode",
-            "version": "v3.0.0",
+            "version": "v4.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/antonioribeiro/google2fa-qrcode.git",
-                "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b"
+                "reference": "16159f84fa0838c276f35d46de57fd90dfbb385c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/ce4d8a729b6c93741c607cfb2217acfffb5bf76b",
-                "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/16159f84fa0838c276f35d46de57fd90dfbb385c",
+                "reference": "16159f84fa0838c276f35d46de57fd90dfbb385c",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1",
-                "pragmarx/google2fa": ">=4.0"
+                "php": "^8.1",
+                "pragmarx/google2fa": "^8.0|^9.0"
            },
            "require-dev": {
-                "bacon/bacon-qr-code": "^2.0",
-                "chillerlan/php-qrcode": "^1.0|^2.0|^3.0|^4.0",
+                "bacon/bacon-qr-code": "^2.0|^3.0",
+                "chillerlan/php-qrcode": "^5.0|^6.0",
                "khanamiryan/qrcode-detector-decoder": "^1.0",
-                "phpunit/phpunit": "~4|~5|~6|~7|~8|~9"
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "~9|~10|~11|~12|~13"
            },
            "suggest": {
                "bacon/bacon-qr-code": "For QR Code generation, requires imagick",
@@ -5000,9 +5001,9 @@
            ],
            "support": {
                "issues": "https://github.com/antonioribeiro/google2fa-qrcode/issues",
-                "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v3.0.0"
+                "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v4.0.0"
            },
-            "time": "2021-08-15T12:53:48+00:00"
+            "time": "2026-05-08T19:24:44+00:00"
        },
        {
            "name": "pragmarx/random",
@@ -6497,16 +6498,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v8.0.9",
+            "version": "v8.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "2866a183cd942bbaa81e9fdbd1ef1ea902c5ee2d"
+                "reference": "8ff96cde73684bfa32b702f5cff1eb83b1fac429"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/2866a183cd942bbaa81e9fdbd1ef1ea902c5ee2d",
-                "reference": "2866a183cd942bbaa81e9fdbd1ef1ea902c5ee2d",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/8ff96cde73684bfa32b702f5cff1eb83b1fac429",
+                "reference": "8ff96cde73684bfa32b702f5cff1eb83b1fac429",
                "shasum": ""
            },
            "require": {
@@ -6518,7 +6519,6 @@
                "symfony/var-exporter": "^7.4|^8.0"
            },
            "conflict": {
-                "doctrine/dbal": "<4.3",
                "ext-redis": "<6.1",
                "ext-relay": "<0.12.1"
            },
@@ -6573,7 +6573,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v8.0.9"
+                "source": "https://github.com/symfony/cache/tree/v8.0.10"
            },
            "funding": [
                {
@@ -6593,20 +6593,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-04-29T15:02:55+00:00"
+            "time": "2026-05-05T08:24:00+00:00"
        },
        {
            "name": "symfony/cache-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868"
+                "reference": "225e8a254166bd3442e370c6f50145465db63831"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868",
-                "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/225e8a254166bd3442e370c6f50145465db63831",
+                "reference": "225e8a254166bd3442e370c6f50145465db63831",
                "shasum": ""
            },
            "require": {
@@ -6620,7 +6620,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -6653,7 +6653,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -6664,12 +6664,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-03-13T15:25:07+00:00"
+            "time": "2026-05-05T15:33:14+00:00"
        },
        {
            "name": "symfony/clock",
@@ -6909,16 +6913,16 @@
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b",
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b",
                "shasum": ""
            },
            "require": {
@@ -6931,7 +6935,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -6956,7 +6960,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -6967,12 +6971,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-04-13T15:52:40+00:00"
        },
        {
            "name": "symfony/error-handler",
@@ -7142,16 +7150,16 @@
        },
        {
            "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32",
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32",
                "shasum": ""
            },
            "require": {
@@ -7165,7 +7173,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -7198,7 +7206,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -7209,12 +7217,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
        },
        {
            "name": "symfony/expression-language",
@@ -7449,16 +7461,16 @@
        },
        {
            "name": "symfony/http-client-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "75d7043853a42837e68111812f4d964b01e5101c"
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c",
-                "reference": "75d7043853a42837e68111812f4d964b01e5101c",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
                "shasum": ""
            },
            "require": {
@@ -7471,7 +7483,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -7507,7 +7519,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -7518,12 +7530,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-29T11:18:49+00:00"
+            "time": "2026-03-06T13:17:50+00:00"
        },
        {
            "name": "symfony/http-foundation",
@@ -7607,16 +7623,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v8.0.8",
+            "version": "v8.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1770f6818d83b2fddc12185025b93f39a90cb628"
+                "reference": "fb3f65b3d4ca2dad31c80d323819a762ca31d6ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1770f6818d83b2fddc12185025b93f39a90cb628",
-                "reference": "1770f6818d83b2fddc12185025b93f39a90cb628",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fb3f65b3d4ca2dad31c80d323819a762ca31d6ac",
+                "reference": "fb3f65b3d4ca2dad31c80d323819a762ca31d6ac",
                "shasum": ""
            },
            "require": {
@@ -7687,7 +7703,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v8.0.8"
+                "source": "https://github.com/symfony/http-kernel/tree/v8.0.10"
            },
            "funding": [
                {
@@ -7707,7 +7723,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-31T21:14:05+00:00"
+            "time": "2026-05-06T12:27:31+00:00"
        },
        {
            "name": "symfony/mailer",
@@ -8994,16 +9010,16 @@
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.6.1",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
-                "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
                "shasum": ""
            },
            "require": {
@@ -9021,7 +9037,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -9057,7 +9073,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -9077,7 +9093,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:30:57+00:00"
+            "time": "2026-03-28T09:44:51+00:00"
        },
        {
            "name": "symfony/string",
@@ -9171,16 +9187,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v8.0.8",
+            "version": "v8.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f"
+                "reference": "f63e9342e12646a57c91ef8a366a4f9d8e557b67"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f",
-                "reference": "27c03ae3940de24ba2f71cfdbac824f2aa1fdf2f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/f63e9342e12646a57c91ef8a366a4f9d8e557b67",
+                "reference": "f63e9342e12646a57c91ef8a366a4f9d8e557b67",
                "shasum": ""
            },
            "require": {
@@ -9240,7 +9256,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v8.0.8"
+                "source": "https://github.com/symfony/translation/tree/v8.0.10"
            },
            "funding": [
                {
@@ -9260,20 +9276,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-30T15:14:47+00:00"
+            "time": "2026-05-06T11:30:54+00:00"
        },
        {
            "name": "symfony/translation-contracts",
-            "version": "v3.6.1",
+            "version": "v3.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "65a8bc82080447fae78373aa10f8d13b38338977"
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977",
-                "reference": "65a8bc82080447fae78373aa10f8d13b38338977",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d",
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d",
                "shasum": ""
            },
            "require": {
@@ -9286,7 +9302,7 @@
                    "name": "symfony/contracts"
                },
                "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                }
            },
            "autoload": {
@@ -9322,7 +9338,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.7.0"
            },
            "funding": [
                {
@@ -9342,7 +9358,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
        },
        {
            "name": "symfony/uid",
@@ -10176,16 +10192,16 @@
        },
        {
            "name": "carthage-software/mago",
-            "version": "1.25.2",
+            "version": "1.26.0",
            "source": {
                "type": "git",
                "url": "https://github.com/carthage-software/mago.git",
-                "reference": "54e9645d15381aa78bf7113e01dcd1734ec43737"
+                "reference": "9ae2f7ad58ffeeaa2ff890e736a8658f8e397cdf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/carthage-software/mago/zipball/54e9645d15381aa78bf7113e01dcd1734ec43737",
-                "reference": "54e9645d15381aa78bf7113e01dcd1734ec43737",
+                "url": "https://api.github.com/repos/carthage-software/mago/zipball/9ae2f7ad58ffeeaa2ff890e736a8658f8e397cdf",
+                "reference": "9ae2f7ad58ffeeaa2ff890e736a8658f8e397cdf",
                "shasum": ""
            },
            "require": {
@@ -10220,7 +10236,7 @@
            ],
            "support": {
                "issues": "https://github.com/carthage-software/mago/issues",
-                "source": "https://github.com/carthage-software/mago/tree/1.25.2"
+                "source": "https://github.com/carthage-software/mago/tree/1.26.0"
            },
            "funding": [
                {
@@ -10228,7 +10244,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-05-02T23:21:31+00:00"
+            "time": "2026-05-06T21:44:02+00:00"
        },
        {
            "name": "cloudcreativity/json-api-testing",
@@ -10290,16 +10306,16 @@
        },
        {
            "name": "composer/class-map-generator",
-            "version": "1.7.2",
+            "version": "1.7.3",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "6a9c2f0970022ab00dc58c07d0685dd712f2231b"
+                "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/6a9c2f0970022ab00dc58c07d0685dd712f2231b",
-                "reference": "6a9c2f0970022ab00dc58c07d0685dd712f2231b",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f",
+                "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f",
                "shasum": ""
            },
            "require": {
@@ -10343,7 +10359,7 @@
            ],
            "support": {
                "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.7.2"
+                "source": "https://github.com/composer/class-map-generator/tree/1.7.3"
            },
            "funding": [
                {
@@ -10355,7 +10371,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-03-30T15:36:56+00:00"
+            "time": "2026-05-05T09:17:07+00:00"
        },
        {
            "name": "composer/pcre",
@@ -11648,16 +11664,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "14.1.6",
+            "version": "14.1.7",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "4991e47adce8e31e554aee8fdaabfc3b1d60707d"
+                "reference": "da6e6b64940901650abcea62430c8c24926b7a71"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4991e47adce8e31e554aee8fdaabfc3b1d60707d",
-                "reference": "4991e47adce8e31e554aee8fdaabfc3b1d60707d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/da6e6b64940901650abcea62430c8c24926b7a71",
+                "reference": "da6e6b64940901650abcea62430c8c24926b7a71",
                "shasum": ""
            },
            "require": {
@@ -11714,7 +11730,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.7"
            },
            "funding": [
                {
@@ -11734,7 +11750,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-04-24T13:10:08+00:00"
+            "time": "2026-05-04T15:51:53+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
        // see cer.php for exchange rates feature flag.
    ],
-'version' => 'develop/2026-05-03',
-'build_time' => 1777786936,
+'version' => 'develop/2026-05-09',
+'build_time' => 1778308665,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

@@ -198,6 +198,7 @@ return [
    'default_locale'                       => env_default_when_empty(env('DEFAULT_LOCALE'), 'equal'),

    // account types that may have or set a currency
+
    'valid_currency_account_types'         => [
        AccountTypeEnum::ASSET->value,
        AccountTypeEnum::LOAN->value,
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
                "patch-package": "^8.0.1"
            },
            "devDependencies": {
-                "postcss": "^8.4.47"
+                "postcss": "^8.5.14"
            }
        },
        "node_modules/@babel/code-frame": {
@@ -1052,9 +1052,9 @@
            }
        },
        "node_modules/@babel/plugin-transform-modules-systemjs": {
-            "version": "7.29.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz",
-            "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==",
+            "version": "7.29.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.4.tgz",
+            "integrity": "sha512-N7QmZ0xRZfjHOfZeQLJjwgX2zS9pdGHSVl/cjSGlo4dXMqvurfxXDMKY4RqEKzPozV78VMcd0lxyG13mlbKc4w==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -1518,9 +1518,9 @@
            }
        },
        "node_modules/@babel/preset-env": {
-            "version": "7.29.3",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.3.tgz",
-            "integrity": "sha512-ySZypNLAIH1ClygLDQzVMoGQRViATnkHkYYV6TcNDz+8+jwZCdsguGvsb3EY5d9wyWyhmF1iSuFM0Yh5XPnqSA==",
+            "version": "7.29.5",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.5.tgz",
+            "integrity": "sha512-/69t2aEzGKHD76DyLbHysF/QH2LJOB8iFnYO37unDTKBTubzcMRv0f3H5EiN1Q6ajOd/eB7dAInF0qdFVS06kA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -1563,7 +1563,7 @@
                "@babel/plugin-transform-member-expression-literals": "^7.27.1",
                "@babel/plugin-transform-modules-amd": "^7.27.1",
                "@babel/plugin-transform-modules-commonjs": "^7.28.6",
-                "@babel/plugin-transform-modules-systemjs": "^7.29.0",
+                "@babel/plugin-transform-modules-systemjs": "^7.29.4",
                "@babel/plugin-transform-modules-umd": "^7.27.1",
                "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0",
                "@babel/plugin-transform-new-target": "^7.27.1",
@@ -2523,9 +2523,9 @@
            "license": "MIT"
        },
        "node_modules/@tybys/wasm-util": {
-            "version": "0.10.1",
-            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-            "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+            "version": "0.10.2",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
+            "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
            "dev": true,
            "license": "MIT",
            "optional": true,
@@ -2654,9 +2654,9 @@
            }
        },
        "node_modules/@types/estree": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+            "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
            "dev": true,
            "license": "MIT"
        },
@@ -2800,9 +2800,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "25.6.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
-            "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
+            "version": "25.6.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.2.tgz",
+            "integrity": "sha512-sokuT28dxf9JT5Kady1fsXOvI4HVpjZa95NKT5y9PNTIrs2AsobR4GFAA90ZG8M+nxVRLysCXsVj6eGC7Vbrlw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -2827,9 +2827,9 @@
            "license": "MIT"
        },
        "node_modules/@types/qs": {
-            "version": "6.15.0",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.0.tgz",
-            "integrity": "sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==",
+            "version": "6.15.1",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.1.tgz",
+            "integrity": "sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==",
            "dev": true,
            "license": "MIT"
        },
@@ -2918,57 +2918,57 @@
            }
        },
        "node_modules/@vue/compiler-core": {
-            "version": "3.5.33",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.33.tgz",
-            "integrity": "sha512-3PZLQwFw4Za3TC8t0FvTy3wI16Kt+pmwcgNZca4Pj9iWL2E72a/gZlpBtAJvEdDMdCxdG/qq0C7PN0bsJuv0Rw==",
+            "version": "3.5.34",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.34.tgz",
+            "integrity": "sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "@babel/parser": "^7.29.2",
-                "@vue/shared": "3.5.33",
+                "@babel/parser": "^7.29.3",
+                "@vue/shared": "3.5.34",
                "entities": "^7.0.1",
                "estree-walker": "^2.0.2",
                "source-map-js": "^1.2.1"
            }
        },
        "node_modules/@vue/compiler-dom": {
-            "version": "3.5.33",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.33.tgz",
-            "integrity": "sha512-PXq0yrfCLzzL07rbXO4awtXY1Z06LG2eu6Adg3RJFa/j3Cii217XxxLXG22N330gw7GmALCY0Z8RgXEviwgpjA==",
+            "version": "3.5.34",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.34.tgz",
+            "integrity": "sha512-EbF/T++k0e2MMZlJsBhzK8Sgwt0HcIPOhzn1CTB/lv6sQcyk+OWf8YeiLxZp3ro7MbbLcAfAJ6sEvjFWuNgUCw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "@vue/compiler-core": "3.5.33",
-                "@vue/shared": "3.5.33"
+                "@vue/compiler-core": "3.5.34",
+                "@vue/shared": "3.5.34"
            }
        },
        "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.33",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.33.tgz",
-            "integrity": "sha512-UTUvRO9cY+rROrx/pvN9P5Z7FgA6QGfokUCfhQE4EnmUj3rVnK+CHI0LsEO1pg+I7//iRYMUfcNcCPe7tg0CoA==",
+            "version": "3.5.34",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.34.tgz",
+            "integrity": "sha512-D/ihr6uZeIt6r+pVZf46RWT1fAsLFMbUP7k8G1VkiiWexriED9GrX3echHd4Abbt17zjlfiFJ8z7a3BxZOPNjg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "@babel/parser": "^7.29.2",
-                "@vue/compiler-core": "3.5.33",
-                "@vue/compiler-dom": "3.5.33",
-                "@vue/compiler-ssr": "3.5.33",
-                "@vue/shared": "3.5.33",
+                "@babel/parser": "^7.29.3",
+                "@vue/compiler-core": "3.5.34",
+                "@vue/compiler-dom": "3.5.34",
+                "@vue/compiler-ssr": "3.5.34",
+                "@vue/shared": "3.5.34",
                "estree-walker": "^2.0.2",
                "magic-string": "^0.30.21",
-                "postcss": "^8.5.10",
+                "postcss": "^8.5.14",
                "source-map-js": "^1.2.1"
            }
        },
        "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.33",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.33.tgz",
-            "integrity": "sha512-IErjYdnj1qIupG5xxiVIYiiRvDhGWV4zuh/RCrwfYpuL+HWQzeU6lCk/nF9r7olWMnjKxCAkOctT2qFWFkzb1A==",
+            "version": "3.5.34",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.34.tgz",
+            "integrity": "sha512-cDtTHKibkThKGHH1SP+WdccquNRYQDFH6rRjQCqT9G2ltFAfoR5pUftpab/z+aM5mW9HLLVQW7hfKKQe/1GBeQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "@vue/compiler-dom": "3.5.33",
-                "@vue/shared": "3.5.33"
+                "@vue/compiler-dom": "3.5.34",
+                "@vue/shared": "3.5.34"
            }
        },
        "node_modules/@vue/component-compiler-utils": {
@@ -3050,9 +3050,9 @@
            "license": "MIT"
        },
        "node_modules/@vue/shared": {
-            "version": "3.5.33",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.33.tgz",
-            "integrity": "sha512-5vR2QIlmaLG77Ygd4pMP6+SGQ5yox9VhtnbDWTy9DzMzdmeLxZ1QqxrywEZ9sa1AVubfIJyaCG3ytyWU81ufcQ==",
+            "version": "3.5.34",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.34.tgz",
+            "integrity": "sha512-24uqU4OIiX29ryC3MeWid/Xf2fa2EFRUVLb77nRhk+UrTVrh/XiGtFAFmJBAtBRbjwNdsPRP+jj/OL27Eg1NDA==",
            "dev": true,
            "license": "MIT"
        },
@@ -3699,9 +3699,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.10.25",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.25.tgz",
-            "integrity": "sha512-QO/VHsXCQdnzADMfmkeOPvHdIAkoB7i0/rGjINPJEetLx75hNttVWGQ/jycHUDP9zZ9rupbm60WRxcwViB0MiA==",
+            "version": "2.10.28",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.28.tgz",
+            "integrity": "sha512-Ic44hnOtFIgravCunj1ifSoQPSUrkNiJuH9Mf6jr2jjoA74icqV8wU0KuadXeOR8zuIJMOoTv0GuQjZ9ZYNMeA==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
@@ -4135,9 +4135,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001791",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz",
-            "integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==",
+            "version": "1.0.30001792",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001792.tgz",
+            "integrity": "sha512-hVLMUZFgR4JJ6ACt1uEESvQN1/dBVqPAKY0hgrV70eN3391K6juAfTjKZLKvOMsx8PxA7gsY1/tLMMTcfFLLpw==",
            "dev": true,
            "funding": [
                {
@@ -5339,9 +5339,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.349",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.349.tgz",
-            "integrity": "sha512-QsWVGyRuY07Aqb234QytTfwd5d9AJlfNIQ5wIOl1L+PZDzI9d9+Fn0FRale/QYlFxt/bUnB0/nLd1jFPGxGK1A==",
+            "version": "1.5.353",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.353.tgz",
+            "integrity": "sha512-kOrWphBi8TOZyiJZqsgqIle0lw+tzmnQK83pV9dZUd01Nm2POECSyFQMAuarzZdYqQW7FH9RaYOuaRo3h+bQ3w==",
            "dev": true,
            "license": "ISC"
        },
@@ -5396,9 +5396,9 @@
            }
        },
        "node_modules/enhanced-resolve": {
-            "version": "5.21.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",
-            "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==",
+            "version": "5.21.2",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.2.tgz",
+            "integrity": "sha512-xe9vQb5kReirPUxgQrXA3ihgbCqssmTiM7cOZ+Gzu+VeGWgpV98lLZvp0dl4yriyAePcewxGUs9UpKD8PET9KQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -5753,9 +5753,9 @@
            "license": "MIT"
        },
        "node_modules/fast-uri": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
-            "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
+            "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
            "dev": true,
            "funding": [
                {
@@ -6648,9 +6648,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "26.0.8",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.8.tgz",
-            "integrity": "sha512-BRzLom0mhDhV9v0QhgUUHWQJuwFmnr1194xEcNLYD6ym8y8s542n4jXUvRLnhNTbh9PmpU6kGZamyuGHQMsGjw==",
+            "version": "26.0.10",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.10.tgz",
+            "integrity": "sha512-k3yGPAlWR2RdMYoVXJoDZDT87qeHIWKH7gVksdZMpRty7QX/D9QZeYGvN08KGbKHke9wn01eYT+EEsrqX/YTlw==",
            "funding": [
                {
                    "type": "individual",
@@ -6676,9 +6676,9 @@
            }
        },
        "node_modules/i18next-chained-backend": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/i18next-chained-backend/-/i18next-chained-backend-5.0.3.tgz",
-            "integrity": "sha512-VUwc+yFpZzmIvtPfSdTv1+CjgZGZwGug6qHyIuSES/n7RDhVARFxthjML0anUMJVjlvLfRW/x6+U4UrxXBflmw==",
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/i18next-chained-backend/-/i18next-chained-backend-5.0.4.tgz",
+            "integrity": "sha512-xM7kSODBvvtAwPoIoI9WX7LMMdrT5RCvqriUk7juHg5dUgRTTfMoOm8PcZeqxKy9Fn1t4psZwgmeB5Ck43cvrg==",
            "license": "MIT",
            "dependencies": {
                "@babel/runtime": "^7.28.4"
@@ -6895,9 +6895,9 @@
            }
        },
        "node_modules/ipaddr.js": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz",
-            "integrity": "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==",
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz",
+            "integrity": "sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==",
            "dev": true,
            "license": "MIT",
            "engines": {
@@ -6945,13 +6945,13 @@
            }
        },
        "node_modules/is-core-module": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+            "version": "2.16.2",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
+            "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "hasown": "^2.0.2"
+                "hasown": "^2.0.3"
            },
            "engines": {
                "node": ">= 0.4"
@@ -8765,9 +8765,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.5.13",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz",
-            "integrity": "sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==",
+            "version": "8.5.14",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz",
+            "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==",
            "dev": true,
            "funding": [
                {
@@ -10088,9 +10088,9 @@
            }
        },
        "node_modules/semver": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
+            "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
            "license": "ISC",
            "bin": {
                "semver": "bin/semver.js"
@@ -10767,9 +10767,9 @@
            }
        },
        "node_modules/terser": {
-            "version": "5.46.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
-            "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
+            "version": "5.47.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.47.1.tgz",
+            "integrity": "sha512-tPbLXTI6ohPASb/1YViL428oEHu6/qv1OxqYnfaonVCFHqx4+wCd95pHrQWsL5X4pl90CTyW9piSAsS2L0VoMw==",
            "dev": true,
            "license": "BSD-2-Clause",
            "dependencies": {
@@ -10786,9 +10786,9 @@
            }
        },
        "node_modules/terser-webpack-plugin": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz",
-            "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==",
+            "version": "5.6.0",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz",
+            "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10808,12 +10808,39 @@
                "webpack": "^5.1.0"
            },
            "peerDependenciesMeta": {
+                "@minify-html/node": {
+                    "optional": true
+                },
                "@swc/core": {
                    "optional": true
                },
+                "@swc/css": {
+                    "optional": true
+                },
+                "@swc/html": {
+                    "optional": true
+                },
+                "clean-css": {
+                    "optional": true
+                },
+                "cssnano": {
+                    "optional": true
+                },
+                "csso": {
+                    "optional": true
+                },
                "esbuild": {
                    "optional": true
                },
+                "html-minifier-terser": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "postcss": {
+                    "optional": true
+                },
                "uglify-js": {
                    "optional": true
                }
@@ -12228,7 +12255,7 @@
                "font-awesome": "^4.7.0",
                "jquery": "^3",
                "laravel-mix": "^6.0",
-                "postcss": "^8.4.47",
+                "postcss": "^8.5.14",
                "uiv": "^1.4",
                "vue": "^2.7",
                "vue-i18n": "^8",
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
        "resources/assets/v2"
    ],
    "devDependencies": {
-        "postcss": "^8.4.47"
+        "postcss": "^8.5.14"
    },
    "dependencies": {
        "patch-package": "^8.0.1"
--- a/resources/assets/v1/package.json
+++ b/resources/assets/v1/package.json
@@ -22,7 +22,7 @@
        "font-awesome": "^4.7.0",
        "jquery": "^3",
        "laravel-mix": "^6.0",
-        "postcss": "^8.4.47",
+        "postcss": "^8.5.14",
        "uiv": "^1.4",
        "vue": "^2.7",
        "vue-i18n": "^8",
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -1398,6 +1398,7 @@ return [
    'pref_locale'                                         => 'Locale settings',
    'pref_languages_help'                                 => 'Firefly III supports several languages. Which one do you prefer?',
    'pref_locale_help'                                    => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
+    'pref_locale_exception'                               => 'Firefly III can only change how you view dates. Entering a date will always be formatted according to your browser settings, not Firefly III settings. If your browser is set to "English (US)" you must always enter the date formatted as mm/dd/yyyy. No setting in Firefly III can change that.',
    'pref_locale_no_demo'                                 => 'This feature won\'t work for the demo user.',
    'pref_convert_to_primary'                             => 'Display amounts in your primary currency',
    'pref_convert_to_primary_help'                        => 'This option will make Firefly III try to display and show your primary currency in as many places as possible, converting amounts where necessary. This sacrifices accuracy for ease of use, because conversion is not always exact. Please verify that Firefly III has the necessary conversion rates on the "exchange rates"-page.',
@@ -1813,6 +1814,13 @@ return [
    'options'                                             => 'Options',

    // budgets:
+    'spent_this_period'                                   => 'Spent on this budget',
+    'spent_this_period_per_day'                           => 'Spent on this budget per day (:days day(s))',
+    'spent_in_budget_limit_outside_period'                => 'Spent on this budget, but NOT in this period',
+    'spent_in_budget_limit_outside_period_per_day'        => 'Spent on this budget, but NOT in this period per day (:days day(s))',
+    'left_in_budget_limit_overview'                       => 'Left in this budget',
+    'left_in_budget_limit_per_day'                        => 'Left in this budget per day (:days day(s))',
+    'nothing_left_in_budget'                              => 'The budget is now empty',
    'daily_budgets'                                       => 'Daily budgets',
    'weekly_budgets'                                      => 'Weekly budgets',
    'monthly_budgets'                                     => 'Monthly budgets',
--- a/resources/views/budgets/partials/amount-left.twig
+++ b/resources/views/budgets/partials/amount-left.twig
@@ -2,21 +2,21 @@
 {% for budgetLimit in budget.budgeted %}
    <span class="left_span" data-currency="{{ budgetLimit.currency_id }}" data-limit="{{ budgetLimit.id }}" data-value="{{ budgetLimit.left }}" class="amount_left">
        {# the amount left #}
-        {{ formatAmountBySymbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
+        <span title="{{ 'left_in_budget_limit_overview'|_ }}">{{ formatAmountBySymbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>

        {# if the budget limit is in the past, this is not interesting. #}
        {# if there is nothing left, this is not interesting. #}
        {% if not budgetLimit.in_past and -1 == bccomp('0',budgetLimit.left) %}
            {% if 0 == budgetLimit.active_days_left %}
-                ({{ formatAmountBySymbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: 0}) }}">({{ formatAmountBySymbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
            {% else %}
-                ({{ formatAmountBySymbol(budgetLimit.left / budgetLimit.active_days_left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: budgetLimit.active_days_left}) }}">({{ formatAmountBySymbol(budgetLimit.left / budgetLimit.active_days_left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
            {% endif %}
        {% endif %}

        {# if there is nothing left, just format 0.00 #}
        {% if not budgetLimit.in_past and -1 != bccomp('0',budgetLimit.left) %}
-            ({{ formatAmountBySymbol('0', budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+            <span title="{{ 'nothing_left_in_budget'|_ }}">({{ formatAmountBySymbol('0', budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
        {% endif %}
 </span><br />
 {% endfor %}
--- a/resources/views/budgets/partials/amount-spent.twig
+++ b/resources/views/budgets/partials/amount-spent.twig
@@ -1,10 +1,10 @@
 {# this is spent in budget limits: #}
 {% for budgetLimit in budget.budgeted %}
-    {{ formatAmountBySymbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
+    <span title="{{ 'spent_this_period'|_ }}">{{ formatAmountBySymbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
    {% if 0 == budgetLimit.active_days_passed %}
-        ({{ formatAmountBySymbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+        <span title="{{ trans('firefly.spent_this_period_per_day', {days: 0}) }}">({{ formatAmountBySymbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
    {% else %}
-        ({{ formatAmountBySymbol(budgetLimit.spent / budgetLimit.active_days_passed, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+        <span title="{{ trans('firefly.spent_this_period_per_day', {days: budgetLimit.active_days_passed}) }}">({{ formatAmountBySymbol(budgetLimit.spent / budgetLimit.active_days_passed, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
    {% endif %}
 <br />
 {% endfor %}
@@ -12,11 +12,11 @@
 {# this is spent NOT in budget limits: #}
 {% for spent in budget.spent %}
    {% if 0 != bccomp('0', spent.spent_outside)  %}
-        {{ formatAmountBySymbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }}
+        <span title="{{ 'spent_in_budget_limit_outside_period'|_ }}">{{ formatAmountBySymbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }}</span>
        {% if 0 == activeDaysPassed %}
-            ({{ formatAmountBySymbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }})
+            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: 0}) }}">({{ formatAmountBySymbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }})</span>
        {% else %}
-            ({{ formatAmountBySymbol(spent.spent_outside / activeDaysPassed, spent.currency_symbol, spent.currency_decimal_places) }})
+            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: activeDaysPassed}) }}">({{ formatAmountBySymbol(spent.spent_outside / activeDaysPassed, spent.currency_symbol, spent.currency_decimal_places) }})</span>
            {% endif %}
        <br />
    {% endif %}
--- a/resources/views/preferences/index.twig
+++ b/resources/views/preferences/index.twig
@@ -44,7 +44,7 @@
                                    {# language #}
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_languages'|_ }}</h3>
-                                        <p class="text-info">{{ 'pref_languages_help'|_ }}</p>
+                                        <p>{{ 'pref_languages_help'|_ }}</p>
                                        <div class="form-group">
                                            <div class="col-sm-12">
                                                <select class="form-control" id="lang_holder" name="language">
@@ -63,7 +63,7 @@
                                        </div>


-                                        <p class="text-info">
+                                        <p>
                                            <br/>
                                            {{ 'pref_languages_locale'|_ }}
                                        </p>
@@ -73,7 +73,8 @@
                                    {% if not isDocker %}
                                        <div class="preferences-box">
                                            <h3>{{ 'pref_locale'|_ }}</h3>
-                                            <p class="text-info">{{ 'pref_locale_help'|_ }}</p>
+                                            <p>{{ 'pref_locale_help'|_ }}</p>
+                                            <p class="text-warning">{{ 'pref_locale_exception'|_ }}</p>
                                            <div class="form-group">
                                                <div class="col-sm-12">
                                                    <select class="form-control" id="locale_holder" name="locale">
@@ -104,7 +105,7 @@
                                    {# fiscal year #}
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_custom_fiscal_year'|_ }}</h3>
-                                        <p class="text-info">
+                                        <p>
                                            {{ 'pref_custom_fiscal_year_help'|_ }}
                                        </p>
                                        {% set isCustomFiscalYear = customFiscalYear == 1 ? true : false %}
@@ -116,7 +117,7 @@
                                    {% if fireflyiiiconfig('enable_exchange_rates', true) %}
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_convert_to_primary'|_ }}</h3>
-                                        <p class="text-info">
+                                        <p>
                                            {{ 'pref_convert_to_primary_help'|_ }}
                                        </p>
                                        {{ ExpandedForm.checkbox('convertToPrimary','1',convertToPrimary,{ 'label' : 'pref_convert_primary_help'|_ }) }}
@@ -125,7 +126,7 @@
                                    {#  conversion back to primary currency #}
                                        <div class="preferences-box">
                                            <h3>{{ 'pref_anonymous'|_ }}</h3>
-                                            <p class="text-info">
+                                            <p>
                                                {{ 'pref_anonymous_help'|_ }}
                                            </p>
                                            {{ ExpandedForm.checkbox('anonymous','1',anonymous,{ 'label' : 'pref_anonymous_label'|_ }) }}
@@ -138,7 +139,7 @@
                                    {# transaction preferences #}
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_optional_fields_transaction'|_ }}</h3>
-                                        <p class="text-info">
+                                        <p>
                                            {{ 'pref_optional_fields_transaction_help'|_ }}
                                        </p>
                                        <h4>{{ 'optional_tj_date_fields'|_ }}</h4>
@@ -169,7 +170,7 @@
                                <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_home_screen_accounts'|_ }}</h3>
-                                        <p class="text-info">{{ 'pref_home_screen_accounts_help'|_ }}</p>
+                                        <p>{{ 'pref_home_screen_accounts_help'|_ }}</p>
                                        {% for type, accounts in groupedAccounts %}
                                            <strong>{{ type }}</strong>
                                            {% for id, name in accounts %}
@@ -206,7 +207,7 @@
                                    {# view range #}
                                    <div class="preferences-box">
                                        <h3>{{ 'pref_view_range'|_ }}</h3>
-                                        <p class="text-info">{{ 'pref_view_range_help'|_ }}</p>
+                                        <p>{{ 'pref_view_range_help'|_ }}</p>

                                        <div class="radio">
                                            <label>
@@ -311,12 +312,12 @@
                                <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                                    <div class="preferences-box">
                                        <h3>{{ 'list_page_size_title'|_ }}</h3>
-                                        <p class="text-info">{{ 'list_page_size_help'|_ }}</p>
+                                        <p>{{ 'list_page_size_help'|_ }}</p>
                                        {{ ExpandedForm.integer('listPageSize',listPageSize,{'label' : 'list_page_size_label'|_}) }}
                                    </div>
                                    <div class="preferences-box">
                                        <h3>{{ 'dark_mode_preference'|_ }}</h3>
-                                        <p class="text-info">{{ 'dark_mode_preference_help'|_ }}</p>
+                                        <p>{{ 'dark_mode_preference_help'|_ }}</p>
                                        {% for mode in availableDarkModes %}
                                            <div class="radio">
                                                <label>
Author	SHA1	Message	Date
github-actions[bot]	86adf11263	Merge pull request #12229 from firefly-iii/release-1778308665 🤖 Automatically merge the PR into the develop branch.	2026-05-09 08:37:52 +02:00
JC5	045f875041	🤖 Auto commit for release 'develop' on 2026-05-09	2026-05-09 08:37:45 +02:00
James Cole	f781e9f2b6	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # package-lock.json	2026-05-09 08:32:43 +02:00
James Cole	5eb52812f0	Merge branch 'main' into develop # Conflicts: # package-lock.json	2026-05-09 08:32:08 +02:00
James Cole	916abd8464	Merge pull request #12228 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-3d438dea79 Bump @babel/plugin-transform-modules-systemjs from 7.29.0 to 7.29.4 in the npm_and_yarn group across 1 directory	2026-05-09 08:27:14 +02:00
dependabot[bot]	6baca9510f	Bump @babel/plugin-transform-modules-systemjs Bumps the npm_and_yarn group with 1 update in the / directory: [@babel/plugin-transform-modules-systemjs](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-systemjs). Updates `@babel/plugin-transform-modules-systemjs` from 7.29.0 to 7.29.4 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.4/packages/babel-plugin-transform-modules-systemjs) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-modules-systemjs" dependency-version: 7.29.4 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-09 05:54:10 +00:00
github-actions[bot]	5c22a40849	Merge pull request #12227 from firefly-iii/release-1778303410 🤖 Automatically merge the PR into the develop branch.	2026-05-09 07:10:19 +02:00
JC5	51e994056a	🤖 Auto commit for release 'develop' on 2026-05-09	2026-05-09 07:10:10 +02:00
James Cole	984e735bc1	Fix https://github.com/firefly-iii/firefly-iii/issues/12223	2026-05-09 07:02:06 +02:00
James Cole	c1a271d9c4	Merge pull request #12226 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-053c9c4054	2026-05-09 05:50:33 +02:00
dependabot[bot]	0f9a2f010c	Bump fast-uri in the npm_and_yarn group across 1 directory Bumps the npm_and_yarn group with 1 update in the / directory: [fast-uri](https://github.com/fastify/fast-uri). Updates `fast-uri` from 3.1.0 to 3.1.2 - [Release notes](https://github.com/fastify/fast-uri/releases) - [Commits](https://github.com/fastify/fast-uri/compare/v3.1.0...v3.1.2) --- updated-dependencies: - dependency-name: fast-uri dependency-version: 3.1.2 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>	2026-05-08 23:26:04 +00:00
James Cole	ed9557aaa0	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2026-05-05 19:52:46 +02:00
James Cole	1cc471fcc4	New guidelines.	2026-05-05 19:51:57 +02:00
github-actions[bot]	6c27424bfe	Merge pull request #12219 from firefly-iii/release-1777868588 🤖 Automatically merge the PR into the develop branch.	2026-05-04 06:23:15 +02:00
JC5	38576f7fe0	🤖 Auto commit for release 'develop' on 2026-05-04	2026-05-04 06:23:09 +02:00
github-actions[bot]	5b80a5bdbe	Merge pull request #12215 from firefly-iii/release-1777795578 🤖 Automatically merge the PR into the develop branch.	2026-05-03 10:06:25 +02:00
JC5	0202f4abd9	🤖 Auto commit for release 'develop' on 2026-05-03	2026-05-03 10:06:18 +02:00
James Cole	615d568479	Change sentence	2026-05-03 10:00:29 +02:00
github-actions[bot]	2ace0d3f23	Merge pull request #12214 from firefly-iii/release-1777794370 🤖 Automatically merge the PR into the develop branch.	2026-05-03 09:46:17 +02:00
JC5	42204f8dc1	🤖 Auto commit for release 'develop' on 2026-05-03	2026-05-03 09:46:10 +02:00
James Cole	cfac8fa569	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2026-05-03 09:24:38 +02:00
James Cole	04704392f3	Fix amount display in budget overview.	2026-05-03 09:24:03 +02:00
James Cole	3a9ac03358	Add entry in preferences.	2026-05-02 15:04:23 +02:00