Merge pull request #10213 from firefly-iii/release-1745742741

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-04-27
2025-12-30 07:01:25 +00:00 · 2025-04-27 10:32:28 +02:00 · 2025-04-27 10:32:21 +02:00 · 2025-04-26 17:33:56 +02:00 · 2025-04-26 17:33:49 +02:00 · 2025-04-26 17:29:31 +02:00
20 changed files with 392 additions and 235 deletions
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

 ## 2025
+- Denis Iskandarov
 - =
 - Lompi
 - Jose Diaz-Gonzalez
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -43,6 +43,7 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;

 /**
@@ -104,10 +105,10 @@ class BasicController extends Controller
        $billData     = $this->getSubscriptionInformation($start, $end);
        $spentData    = $this->getLeftToSpendInfo($start, $end);
        $netWorthData = $this->getNetWorthInfo($end);
-        //                $balanceData  = [];
-        //                $billData     = [];
+        //                        $balanceData  = [];
+        //                        $billData     = [];
        //                $spentData    = [];
-        //                $netWorthData = [];
+        //                        $netWorthData = [];
        $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);

        // give new keys
@@ -539,26 +540,63 @@ class BasicController extends Controller
                ),
            ];
        }
+        unset($leftToSpend);
        if (0 === count($return)) {
-            $currency              = $this->nativeCurrency;
-            $return[$currency->id] = [
-                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
-                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => '0',
-                'no_available_budgets'    => true,
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
-                'local_icon'              => 'money',
-                'sub_title'               => app('amount')->formatFlat(
-                    $currency->symbol,
-                    $currency->decimal_places,
-                    '0',
-                    false
-                ),
-            ];
+            // a small trick to get every expense in this period, regardless of budget.
+            $spent = $this->opsRepository->sumExpenses($start, $end, null, new Collection());
+            foreach ($spent as $row) {
+                // either an amount was budgeted or 0 is available.
+                $currencyId          = (int) $row['currency_id'];
+                $spentInCurrency     = $row['sum'];
+                $perDay              = '0';
+                if (0 !== $days && -1 === bccomp($spentInCurrency, '0')) {
+                    $perDay = bcdiv($spentInCurrency, (string) $days);
+                }
+
+                Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
+
+                $return[$currencyId] = [
+                    'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                    'title'                   => trans('firefly.spent'),
+                    'no_available_budgets'    => true,
+                    'monetary_value'          => $spentInCurrency,
+                    'currency_id'             => (string) $row['currency_id'],
+                    'currency_code'           => $row['currency_code'],
+                    'currency_symbol'         => $row['currency_symbol'],
+                    'currency_decimal_places' => $row['currency_decimal_places'],
+                    'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $spentInCurrency, false),
+                    'local_icon'              => 'money',
+                    'sub_title'               => app('amount')->formatFlat(
+                        $row['currency_symbol'],
+                        $row['currency_decimal_places'],
+                        $perDay,
+                        false
+                    ),
+                ];
+            }
+
+            //            $amount = '0';
+            //            // $days
+            //            // fill in by money spent, just count it.
+            //            $currency              = $this->nativeCurrency;
+            //            $return[$currency->id] = [
+            //                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+            //                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+            //                'monetary_value'          => '0',
+            //                'no_available_budgets'    => true,
+            //                'currency_id'             => (string) $currency->id,
+            //                'currency_code'           => $currency->code,
+            //                'currency_symbol'         => $currency->symbol,
+            //                'currency_decimal_places' => $currency->decimal_places,
+            //                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+            //                'local_icon'              => 'money',
+            //                'sub_title'               => app('amount')->formatFlat(
+            //                    $currency->symbol,
+            //                    $currency->decimal_places,
+            //                    '0',
+            //                    false
+            //                ),
+            //            ];
        }

        return array_values($return);
--- a/app/Console/Commands/System/RecalculatesRunningBalance.php
+++ b/app/Console/Commands/System/RecalculatesRunningBalance.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * RecalculatesRunningBalance.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Models\AccountBalanceCalculator;
+use Illuminate\Console\Command;
+
+class RecalculatesRunningBalance extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:refresh-running-balance {--F|force : Force the execution of this command.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refreshes all running balances. May take a long time to run if forced.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        if (true === config('firefly.feature_flags.running_balance_column')) {
+            $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
+            $this->correctBalanceAmounts($this->option('force'));
+            $this->friendlyInfo('Done recalculating account balances.');
+
+            return 0;
+        }
+        $this->friendlyWarning('This command has been disabled.');
+    }
+
+    private function correctBalanceAmounts(bool $forced): void
+    {
+        AccountBalanceCalculator::recalculateAll($forced);
+    }
+}
--- a/app/Helpers/Collector/Extensions/CollectorProperties.php
+++ b/app/Helpers/Collector/Extensions/CollectorProperties.php
@@ -55,6 +55,7 @@ trait CollectorProperties
    private HasMany $query;
    private ?int    $startRow;
    private array   $stringFields;
+    private array   $booleanFields;
    /*
     * This array is used to collect ALL tags the user may search for (using 'setTags').
     * This way the user can call 'setTags' multiple times and get a joined result.
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -82,6 +82,7 @@ class GroupCollector implements GroupCollectorInterface
        $this->hasJoinedAttTables   = false;
        $this->expandGroupSearch    = false;
        $this->hasJoinedMetaTables  = false;
+        $this->booleanFields        = ['balance_dirty'];
        $this->integerFields        = [
            'transaction_group_id',
            'user_id',
@@ -100,7 +101,7 @@ class GroupCollector implements GroupCollectorInterface
            'category_id',
            'budget_id',
        ];
-        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount'];
+        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount', 'source_balance_after', 'destination_balance_after'];
        $this->total                = 0;
        $this->fields               = [
            // group
@@ -131,6 +132,8 @@ class GroupCollector implements GroupCollectorInterface

            // currency info:
            'source.amount as amount',
+            'source.balance_after as source_balance_after',
+            'source.balance_dirty as balance_dirty',
            'source.native_amount as native_amount',
            'source.transaction_currency_id as currency_id',
            'currency.code as currency_code',
@@ -149,6 +152,7 @@ class GroupCollector implements GroupCollectorInterface

            // destination account info (always present)
            'destination.account_id as destination_account_id',
+            'destination.balance_after as destination_balance_after',
        ];
    }

@@ -596,6 +600,9 @@ class GroupCollector implements GroupCollectorInterface
        // convert values to integers:
        $result                  = $this->convertToInteger($result);

+        // convert to boolean
+        $result                  = $this->convertToBoolean($result);
+
        // convert back to strings because SQLite is dumb like that.
        $result                  = $this->convertToStrings($result);

@@ -653,6 +660,15 @@ class GroupCollector implements GroupCollectorInterface
        return $array;
    }

+    private function convertToBoolean(array $array): array
+    {
+        foreach ($this->booleanFields as $field) {
+            $array[$field] = array_key_exists($field, $array) ? (bool) $array[$field] : null;
+        }
+
+        return $array;
+    }
+
    private function convertToStrings(array $array): array
    {
        foreach ($this->stringFields as $field) {
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -145,6 +145,7 @@ class ShowController extends Controller
        $collector->setExpandGroupSearch(true);
        $groups           = $collector->getPaginatedGroups();

+
        Log::debug('End collect transactions');
        Timer::stop('collection');

--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -135,7 +135,7 @@ class EditController extends Controller

        // get rule trigger for update / store-journal:
        $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule);
-        $subTitle       = (string) trans('firefly.edit_rule', ['title' => $rule->title]);
+        $subTitle       = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]);

        // put previous url in session if not redirect from store (not "return_to_edit").
        if (true !== session('rules.edit.fromUpdate')) {
--- a/app/Repositories/Budget/OperationsRepository.php
+++ b/app/Repositories/Budget/OperationsRepository.php
@@ -31,7 +31,6 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupInterface;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
@@ -203,7 +202,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        ?Collection          $accounts = null,
        ?Collection          $budgets = null,
        ?TransactionCurrency $currency = null,
-        bool $convertToNative = false
+        bool                 $convertToNative = false
    ): array {
        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", "%s").', __METHOD__, $currency?->code, var_export($convertToNative, true)));
        // this collector excludes all transfers TO liabilities (which are also withdrawals)
@@ -240,7 +239,9 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
            Log::debug(sprintf('Limit to normal currency %s', $currency->code));
            $collector->setNormalCurrency($currency);
        }
-        $collector->setBudgets($budgets);
+        if ($budgets->count() > 0) {
+            $collector->setBudgets($budgets);
+        }
        $journals   = $collector->getExtractedJournals();

        // same but for transactions in the foreign currency:
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -89,6 +89,7 @@ class AccountBalanceCalculator
        }

        $set      = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);
+        Log::debug(sprintf('Counted %d transaction(s)', $set->count()));

        // the balance value is an array.
        // first entry is the balance, second is the date.
--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.44.2",
+            "version": "v11.44.7",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
                "shasum": ""
            },
            "require": {
@@ -2089,7 +2089,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-03-12T14:34:30+00:00"
+            "time": "2025-04-25T12:40:47+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2228,16 +2228,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.8",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c"
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
                "shasum": ""
            },
            "require": {
@@ -2288,7 +2288,7 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2025-01-26T19:34:36+00:00"
+            "time": "2025-04-22T13:53:47+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@@ -10626,16 +10626,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.3.1",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "58bee8be51daf12d78ed0a909be3b205607d2f27"
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/58bee8be51daf12d78ed0a909be3b205607d2f27",
-                "reference": "58bee8be51daf12d78ed0a909be3b205607d2f27",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/1042fa0c2ee490bb6da7381f3323f7292ad68222",
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222",
                "shasum": ""
            },
            "require": {
@@ -10652,7 +10652,7 @@
                "phpstan/phpstan": "^2.1.11"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^12.0",
+                "doctrine/coding-standard": "^13",
                "laravel/framework": "^11.44.2 || ^12.7.2",
                "mockery/mockery": "^1.6.12",
                "nikic/php-parser": "^5.4",
@@ -10688,13 +10688,9 @@
                {
                    "name": "Can Vural",
                    "email": "can9119@gmail.com"
-                },
-                {
-                    "name": "Nuno Maduro",
-                    "email": "enunomaduro@gmail.com"
                }
            ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
            "keywords": [
                "PHPStan",
                "code analyse",
@@ -10707,19 +10703,15 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.3.1"
+                "source": "https://github.com/larastan/larastan/tree/v3.4.0"
            },
            "funding": [
                {
                    "url": "https://github.com/canvural",
                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
                }
            ],
-            "time": "2025-04-03T20:08:04+00:00"
+            "time": "2025-04-22T09:44:59+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -11701,16 +11693,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "11.5.17",
+            "version": "11.5.18",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c"
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
-                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc3e887c7f3f9917e1bf61e523413d753db00a17",
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17",
                "shasum": ""
            },
            "require": {
@@ -11782,7 +11774,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.18"
            },
            "funding": [
                {
@@ -11793,12 +11785,20 @@
                    "url": "https://github.com/sebastianbergmann",
                    "type": "github"
                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-08T07:59:11+00:00"
+            "time": "2025-04-22T06:09:49+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,7 +78,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-04-22',
+    'version'                      => 'develop/2025-04-27',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

@@ -156,7 +156,7 @@ return [
        'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'],
        //        // 'tlh_AA' => ['name_locale' => 'tlhIngan Hol', 'name_english' => 'Klingon'],
        'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'],
-        'uk_UA' => ['name_locale' => 'Ukranian', 'name_english' => 'Ukranian'],
+        'uk_UA' => ['name_locale' => 'Українська', 'name_english' => 'Ukrainian'],
        'vi_VN' => ['name_locale' => 'Tiếng Việt', 'name_english' => 'Vietnamese'],
        'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'],
        'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'],
--- a/package-lock.json
+++ b/package-lock.json
@@ -1673,9 +1673,9 @@
            }
        },
        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
-            "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz",
+            "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==",
            "cpu": [
                "ppc64"
            ],
@@ -1690,9 +1690,9 @@
            }
        },
        "node_modules/@esbuild/android-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
-            "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz",
+            "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==",
            "cpu": [
                "arm"
            ],
@@ -1707,9 +1707,9 @@
            }
        },
        "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
-            "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz",
+            "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==",
            "cpu": [
                "arm64"
            ],
@@ -1724,9 +1724,9 @@
            }
        },
        "node_modules/@esbuild/android-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
-            "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz",
+            "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==",
            "cpu": [
                "x64"
            ],
@@ -1741,9 +1741,9 @@
            }
        },
        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
-            "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz",
+            "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==",
            "cpu": [
                "arm64"
            ],
@@ -1758,9 +1758,9 @@
            }
        },
        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
-            "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz",
+            "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==",
            "cpu": [
                "x64"
            ],
@@ -1775,9 +1775,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz",
+            "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==",
            "cpu": [
                "arm64"
            ],
@@ -1792,9 +1792,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
-            "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz",
+            "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==",
            "cpu": [
                "x64"
            ],
@@ -1809,9 +1809,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
-            "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz",
+            "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==",
            "cpu": [
                "arm"
            ],
@@ -1826,9 +1826,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-            "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz",
+            "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==",
            "cpu": [
                "arm64"
            ],
@@ -1843,9 +1843,9 @@
            }
        },
        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
-            "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz",
+            "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==",
            "cpu": [
                "ia32"
            ],
@@ -1860,9 +1860,9 @@
            }
        },
        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
-            "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz",
+            "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==",
            "cpu": [
                "loong64"
            ],
@@ -1877,9 +1877,9 @@
            }
        },
        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
-            "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz",
+            "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==",
            "cpu": [
                "mips64el"
            ],
@@ -1894,9 +1894,9 @@
            }
        },
        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
-            "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz",
+            "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==",
            "cpu": [
                "ppc64"
            ],
@@ -1911,9 +1911,9 @@
            }
        },
        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
-            "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz",
+            "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==",
            "cpu": [
                "riscv64"
            ],
@@ -1928,9 +1928,9 @@
            }
        },
        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
-            "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz",
+            "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==",
            "cpu": [
                "s390x"
            ],
@@ -1945,9 +1945,9 @@
            }
        },
        "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
-            "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz",
+            "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==",
            "cpu": [
                "x64"
            ],
@@ -1962,9 +1962,9 @@
            }
        },
        "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz",
+            "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==",
            "cpu": [
                "arm64"
            ],
@@ -1979,9 +1979,9 @@
            }
        },
        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz",
+            "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==",
            "cpu": [
                "x64"
            ],
@@ -1996,9 +1996,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz",
+            "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==",
            "cpu": [
                "arm64"
            ],
@@ -2013,9 +2013,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz",
+            "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==",
            "cpu": [
                "x64"
            ],
@@ -2030,9 +2030,9 @@
            }
        },
        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
-            "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz",
+            "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==",
            "cpu": [
                "x64"
            ],
@@ -2047,9 +2047,9 @@
            }
        },
        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
-            "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz",
+            "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==",
            "cpu": [
                "arm64"
            ],
@@ -2064,9 +2064,9 @@
            }
        },
        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
-            "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz",
+            "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==",
            "cpu": [
                "ia32"
            ],
@@ -2081,9 +2081,9 @@
            }
        },
        "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
-            "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz",
+            "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==",
            "cpu": [
                "x64"
            ],
@@ -3111,9 +3111,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.14.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
-            "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
+            "version": "22.15.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.2.tgz",
+            "integrity": "sha512-uKXqKN9beGoMdBfcaTY1ecwz6ctxuJAcUlwE55938g0ZJ8lRxwAZqRz2AJ4pzpt5dHdTPMB863UZ0ESiFUcP7A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -3782,9 +3782,9 @@
            }
        },
        "node_modules/asn1.js/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -3872,9 +3872,9 @@
            }
        },
        "node_modules/axios": {
-            "version": "1.8.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
-            "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+            "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4021,9 +4021,9 @@
            "license": "MIT"
        },
        "node_modules/bn.js": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-            "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz",
+            "integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==",
            "dev": true,
            "license": "MIT"
        },
@@ -4136,9 +4136,9 @@
            "license": "MIT"
        },
        "node_modules/bootstrap5-tags": {
-            "version": "1.7.10",
-            "resolved": "https://registry.npmjs.org/bootstrap5-tags/-/bootstrap5-tags-1.7.10.tgz",
-            "integrity": "sha512-affAvDcyny6/YU/oZD4U61m9KKIP3pE33041lLrH7oDEKRZN7oWi2TeA0QwWzIyPH0AgsBWET0+ILb04CKyqNw==",
+            "version": "1.7.11",
+            "resolved": "https://registry.npmjs.org/bootstrap5-tags/-/bootstrap5-tags-1.7.11.tgz",
+            "integrity": "sha512-2pEAFRFTW7IRkL1f/TAkMSK9zmZVbYV2+0aFxoThP8hJFvTyHC3dzYa2yJeDygWw2F2dO2a+VDl8VPNrWnaVHA==",
            "license": "MIT"
        },
        "node_modules/brace-expansion": {
@@ -4923,9 +4923,9 @@
            }
        },
        "node_modules/create-ecdh/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -5440,9 +5440,9 @@
            }
        },
        "node_modules/diffie-hellman/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -5635,9 +5635,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.140",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz",
-            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
+            "version": "1.5.143",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.143.tgz",
+            "integrity": "sha512-QqklJMOFBMqe46k8iIOwA9l2hz57V2OKMmP5eSWcUvwx+mASAsbU+wkF1pHjn9ZVSBPrsYWr4/W/95y5SwYg2g==",
            "dev": true,
            "license": "ISC"
        },
@@ -5658,9 +5658,9 @@
            }
        },
        "node_modules/elliptic/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -5762,9 +5762,9 @@
            }
        },
        "node_modules/es-module-lexer": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-            "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+            "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
            "dev": true,
            "license": "MIT"
        },
@@ -5798,9 +5798,9 @@
            }
        },
        "node_modules/esbuild": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
-            "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+            "version": "0.25.3",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
+            "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==",
            "dev": true,
            "hasInstallScript": true,
            "license": "MIT",
@@ -5811,31 +5811,31 @@
                "node": ">=18"
            },
            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.2",
-                "@esbuild/android-arm": "0.25.2",
-                "@esbuild/android-arm64": "0.25.2",
-                "@esbuild/android-x64": "0.25.2",
-                "@esbuild/darwin-arm64": "0.25.2",
-                "@esbuild/darwin-x64": "0.25.2",
-                "@esbuild/freebsd-arm64": "0.25.2",
-                "@esbuild/freebsd-x64": "0.25.2",
-                "@esbuild/linux-arm": "0.25.2",
-                "@esbuild/linux-arm64": "0.25.2",
-                "@esbuild/linux-ia32": "0.25.2",
-                "@esbuild/linux-loong64": "0.25.2",
-                "@esbuild/linux-mips64el": "0.25.2",
-                "@esbuild/linux-ppc64": "0.25.2",
-                "@esbuild/linux-riscv64": "0.25.2",
-                "@esbuild/linux-s390x": "0.25.2",
-                "@esbuild/linux-x64": "0.25.2",
-                "@esbuild/netbsd-arm64": "0.25.2",
-                "@esbuild/netbsd-x64": "0.25.2",
-                "@esbuild/openbsd-arm64": "0.25.2",
-                "@esbuild/openbsd-x64": "0.25.2",
-                "@esbuild/sunos-x64": "0.25.2",
-                "@esbuild/win32-arm64": "0.25.2",
-                "@esbuild/win32-ia32": "0.25.2",
-                "@esbuild/win32-x64": "0.25.2"
+                "@esbuild/aix-ppc64": "0.25.3",
+                "@esbuild/android-arm": "0.25.3",
+                "@esbuild/android-arm64": "0.25.3",
+                "@esbuild/android-x64": "0.25.3",
+                "@esbuild/darwin-arm64": "0.25.3",
+                "@esbuild/darwin-x64": "0.25.3",
+                "@esbuild/freebsd-arm64": "0.25.3",
+                "@esbuild/freebsd-x64": "0.25.3",
+                "@esbuild/linux-arm": "0.25.3",
+                "@esbuild/linux-arm64": "0.25.3",
+                "@esbuild/linux-ia32": "0.25.3",
+                "@esbuild/linux-loong64": "0.25.3",
+                "@esbuild/linux-mips64el": "0.25.3",
+                "@esbuild/linux-ppc64": "0.25.3",
+                "@esbuild/linux-riscv64": "0.25.3",
+                "@esbuild/linux-s390x": "0.25.3",
+                "@esbuild/linux-x64": "0.25.3",
+                "@esbuild/netbsd-arm64": "0.25.3",
+                "@esbuild/netbsd-x64": "0.25.3",
+                "@esbuild/openbsd-arm64": "0.25.3",
+                "@esbuild/openbsd-x64": "0.25.3",
+                "@esbuild/sunos-x64": "0.25.3",
+                "@esbuild/win32-arm64": "0.25.3",
+                "@esbuild/win32-ia32": "0.25.3",
+                "@esbuild/win32-x64": "0.25.3"
            }
        },
        "node_modules/escalade": {
@@ -8031,9 +8031,9 @@
            }
        },
        "node_modules/miller-rabin/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -9592,9 +9592,9 @@
            }
        },
        "node_modules/public-encrypt/node_modules/bn.js": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
-            "integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+            "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
            "dev": true,
            "license": "MIT"
        },
@@ -10968,9 +10968,9 @@
            "license": "MIT"
        },
        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11349,18 +11349,18 @@
            }
        },
        "node_modules/vite": {
-            "version": "6.3.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz",
-            "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==",
+            "version": "6.3.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.3.tgz",
+            "integrity": "sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "esbuild": "^0.25.0",
-                "fdir": "^6.4.3",
+                "fdir": "^6.4.4",
                "picomatch": "^4.0.2",
                "postcss": "^8.5.3",
                "rollup": "^4.34.9",
-                "tinyglobby": "^0.2.12"
+                "tinyglobby": "^0.2.13"
            },
            "bin": {
                "vite": "bin/vite.js"
@@ -11669,14 +11669,15 @@
            "license": "BSD-2-Clause"
        },
        "node_modules/webpack": {
-            "version": "5.99.6",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.6.tgz",
-            "integrity": "sha512-TJOLrJ6oeccsGWPl7ujCYuc0pIq2cNsuD6GZDma8i5o5Npvcco/z+NKvZSFsP0/x6SShVb0+X2JK/JHUjKY9dQ==",
+            "version": "5.99.7",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
+            "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "@types/eslint-scope": "^3.7.7",
                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
                "@webassemblyjs/ast": "^1.14.1",
                "@webassemblyjs/wasm-edit": "^1.14.1",
                "@webassemblyjs/wasm-parser": "^1.14.1",
@@ -11693,7 +11694,7 @@
                "loader-runner": "^4.2.0",
                "mime-types": "^2.1.27",
                "neo-async": "^2.6.2",
-                "schema-utils": "^4.3.0",
+                "schema-utils": "^4.3.2",
                "tapable": "^2.1.1",
                "terser-webpack-plugin": "^5.3.11",
                "watchpack": "^2.4.1",
@@ -11825,9 +11826,9 @@
            "license": "MIT"
        },
        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11977,9 +11978,9 @@
            }
        },
        "node_modules/webpack-dev-server/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -12079,9 +12080,9 @@
            "license": "MIT"
        },
        "node_modules/webpack/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/public/v1/js/ff/index.js
+++ b/public/v1/js/ff/index.js
@@ -62,6 +62,7 @@ function drawChart() {
            // net worth
            var net_worth = [];
            var keepGreen = false;
+            var makeBlue = false;

            for (key in data) {
                // balance
@@ -80,17 +81,14 @@ function drawChart() {

                // left to spend
                if (key.substring(0, 17) === 'left-to-spend-in-') {
+                    left_to_spend_top.push(data[key].value_parsed);
+                    left_to_spend_bottom.push(data[key].sub_title);
                    if(true === data[key].no_available_budgets) {
-                        left_to_spend_top.push('---');
-                        left_to_spend_bottom.push('---');
-                        keepGreen = true;
+                        makeBlue = true;
+                        $('#box-left-to-spend-text').text(data[key].title);
                    }
-                    if(false === data[key].no_available_budgets) {
-                        left_to_spend_top.push(data[key].value_parsed);
-                        left_to_spend_bottom.push(data[key].sub_title);
-                        if (parseFloat(data[key].monetary_value) > 0) {
-                            keepGreen = true;
-                        }
+                    if(false === data[key].no_available_budgets && parseFloat(data[key].monetary_value) > 0) {
+                        keepGreen = true;
                    }
                }

@@ -102,6 +100,9 @@ function drawChart() {
            if(!keepGreen) {
                $('#box-left-to-spend-box').removeClass('bg-green-gradient').addClass('bg-red-gradient')
            }
+            if(makeBlue) {
+                $('#box-left-to-spend-box').removeClass('bg-red-gradient').removeClass('bg-green-gradient').addClass('bg-blue-gradient')
+            }

            // balance
            $('#box-balance-sums').html(balance_top.join(', '));
--- a/resources/assets/v1/src/locales/fr.json
+++ b/resources/assets/v1/src/locales/fr.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "Administrations financi\u00e8res",
        "administrations_index_menu": "Administrations financi\u00e8res",
-        "expires_at": "Expires at",
+        "expires_at": "Expire le",
        "temp_administrations_introduction": "Firefly III aura bient\u00f4t la possibilit\u00e9 de g\u00e9rer plusieurs administrations financi\u00e8res. Pour le moment, vous n'en avez qu'une. Vous pouvez d\u00e9finir le titre de cette administration et de sa devise locale. Cela remplace le param\u00e8tre pr\u00e9c\u00e9dent o\u00f9 vous d\u00e9finissiez votre \"devise par d\u00e9faut\". Ce param\u00e8tre est d\u00e9sormais li\u00e9 \u00e0 l'administration financi\u00e8re et peut \u00eatre diff\u00e9rent par administration.",
        "administration_currency_form_help": "La page peut mettre longtemps \u00e0 charger si vous modifiez la devise locale, car des op\u00e9rations peuvent n\u00e9cessiter une conversion vers votre (nouvelle) devise locale.",
        "administrations_page_edit_sub_title_js": "Modifier l'administration financi\u00e8re \"{title}\"",
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
        "administrations_index_menu": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
-        "expires_at": "Expires at",
+        "expires_at": "\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442",
        "temp_administrations_introduction": "Firefly III \u0432\u0441\u043a\u043e\u0440\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u043c\u0438 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043c\u0438. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0434\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u0435\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443. \u042d\u0442\u043e \u0437\u0430\u043c\u0435\u043d\u044f\u0435\u0442 \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0432\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 \"\u0432\u0430\u043b\u044e\u0442\u0443 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e\". \u0412 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u044d\u0442\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441\u0432\u044f\u0437\u0430\u043d\u0430 \u0441 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0435\u0439 \u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u043e\u0439 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430.",
        "administration_currency_form_help": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u043c\u043d\u043e\u0433\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0430 \u0432 \u043d\u043e\u0432\u0443\u044e \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443.",
        "administrations_page_edit_sub_title_js": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438 \"{title}\"",
--- a/resources/assets/v1/src/locales/sl.json
+++ b/resources/assets/v1/src/locales/sl.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "Finan\u010dne administracije",
        "administrations_index_menu": "Finan\u010dne administracije",
-        "expires_at": "Expires at",
+        "expires_at": "Pote\u010de ob",
        "temp_administrations_introduction": "Firefly III bo kmalu dobil mo\u017enost upravljanja ve\u010d finan\u010dnih administracij. Trenutno imate samo eno. Nastavite lahko naziv te administracije in njeno doma\u010do valuto. To nadome\u0161\u010da prej\u0161njo nastavitev, kjer bi nastavili svojo \"privzeto valuto\". Ta nastavitev je zdaj vezana na finan\u010dno administracijo in se lahko razlikuje glede na administracijo.",
        "administration_currency_form_help": "\u010ce spremenite doma\u010do valuto, lahko traja dolgo \u010dasa, da se stran nalo\u017ei, ker bo transakcijo morda treba pretvoriti v va\u0161o (novo) doma\u010do valuto.",
        "administrations_page_edit_sub_title_js": "Uredi finan\u010dno administracijo \"{title}\"",
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -802,7 +802,7 @@ return [
    'action_value'                                            => 'Action value',
    'stop_executing_other_actions'                            => 'Stop executing other actions',
    'add_rule_action'                                         => 'Add new action',
-    'edit_rule'                                               => 'Edit rule ":title"',
+    'edit_rule'                                               => 'Edit rule #:nr ":title"',
    'delete_rule'                                             => 'Delete rule ":title"',
    'update_rule'                                             => 'Update rule',
    'test_rule_triggers'                                      => 'See matching transactions',
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -43,6 +43,7 @@ return [
    'recurring_transaction'   => 'Recurring transaction',
    'next_due'                => 'Next due',
    'transaction_type'        => 'Type',
+    'running_balance'         => 'Running balance',
    'lastActivity'            => 'Last activity',
    'balanceDiff'             => 'Balance difference',
    'other_meta_data'         => 'Other meta data',
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -33,6 +33,9 @@
        <th class="hidden-xs">&nbsp;</th>
        <th>{{ trans('list.description') }}</th>
        <th>{{ trans('list.amount') }}</th>
+        {% if config('firefly.feature_flags.running_balance_column') %}
+        <th>{{ trans('list.running_balance') }}</th>
+        {% endif %}
        <th>{{ trans('list.date') }}</th>
        <th>{{ trans('list.source_account') }}</th>
        <th>{{ trans('list.destination_account') }}</th>
@@ -250,6 +253,31 @@
                        {% endif %}
                    {% endif %}
                </td>
+                {% if config('firefly.feature_flags.running_balance_column') %}
+                <td>
+                    {% if null == transaction.balance_dirty or false == transaction.balance_dirty %}
+                        {% if transaction.transaction_type_type == 'Deposit' %}
+                            {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {% elseif transaction.transaction_type_type == 'Withdrawal' %}
+                            {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {% elseif transaction.transaction_type_type == 'Opening balance' %}
+                            {% if transaction.source_account_type == 'Initial balance account' %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% else %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% endif %}
+                        {% elseif transaction.transaction_type_type == 'Transfer' %}
+                            {% if account.id == transaction.source_account_id %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% else %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% endif %}
+                        {% else %}
+                            &nbsp;
+                        {% endif %}
+                    {% endif %}
+                </td>
+                {% endif %}
                <td style=" {{ style|raw }}">
                    {{ transaction.date.isoFormat(monthAndDayFormat) }}
                </td>
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -994,7 +994,7 @@ Breadcrumbs::for(
    'rules.edit',
    static function (Generator $breadcrumbs, Rule $rule): void {
        $breadcrumbs->parent('rules.index');
-        $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule]));
+        $breadcrumbs->push(trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]), route('rules.edit', [$rule]));
    }
 );
 Breadcrumbs::for(
Author	SHA1	Message	Date
github-actions[bot]	b330313c55	Merge pull request #10213 from firefly-iii/release-1745742741 🤖 Automatically merge the PR into the develop branch.	2025-04-27 10:32:28 +02:00
JC5	aa9ce73758	🤖 Auto commit for release 'develop' on 2025-04-27	2025-04-27 10:32:21 +02:00
github-actions[bot]	d97fda41b2	Merge pull request #10210 from firefly-iii/release-1745681629 🤖 Automatically merge the PR into the develop branch.	2025-04-26 17:33:56 +02:00
JC5	945ad79c03	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 17:33:49 +02:00
James Cole	6273807525	Merge pull request #10209 from firefly-iii/add-transfer-type Add transfer type	2025-04-26 17:29:31 +02:00
James Cole	50803a2c24	Add transfer type	2025-04-26 17:29:10 +02:00
github-actions[bot]	a0e9b05680	Merge pull request #10208 from firefly-iii/release-1745674111 🤖 Automatically merge the PR into the develop branch.	2025-04-26 15:28:37 +02:00
JC5	41e74cd816	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 15:28:31 +02:00
James Cole	b379c8e36b	Merge pull request #10207 from firefly-iii/fix-running-balance Fix running balance	2025-04-26 15:24:36 +02:00
James Cole	76e893f86e	Fix running balance	2025-04-26 15:24:14 +02:00
github-actions[bot]	5da1599959	Merge pull request #10206 from firefly-iii/release-1745670593 🤖 Automatically merge the PR into the develop branch.	2025-04-26 14:30:02 +02:00
JC5	1d997e7c86	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 14:29:53 +02:00
James Cole	35e2eba303	Merge pull request #10205 from firefly-iii/fix-10197 Fix #10197	2025-04-26 14:24:37 +02:00
James Cole	b50f8f8ecd	Fix #10197	2025-04-26 14:24:13 +02:00
James Cole	c16d3be85f	Merge pull request #10204 from firefly-iii/running-balance Add running balance column.	2025-04-26 14:20:23 +02:00
James Cole	bd1232644f	Add running balance column.	2025-04-26 14:20:00 +02:00
James Cole	37ca460ff2	Merge pull request #10203 from den-is/develop Fix Ukrainian language names	2025-04-26 13:52:47 +02:00
Denis Iskandarov	478acdc847	Fix Ukrainian language names Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>	2025-04-25 18:41:22 +04:00
James Cole	f9ec94ea97	Merge pull request #10184 from firefly-iii/fix-10180 Fix #10180	2025-04-22 20:42:04 +02:00
James Cole	576c5f242c	Fix #10180	2025-04-22 20:41:08 +02:00