Merge pull request #10127 from firefly-iii/release-1744600947

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-04-14
2026-01-11 00:16:54 +00:00 · 2025-04-14 05:22:37 +02:00 · 2025-04-14 05:22:27 +02:00 · 2025-04-11 20:00:28 +02:00 · 2025-04-11 20:00:17 +02:00 · 2025-04-11 19:45:15 +02:00
12 changed files with 239 additions and 187 deletions
--- a/.env.example
+++ b/.env.example
@@ -164,6 +164,13 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_SENDMAIL_COMMAND=

+#
+# If you use self-signed certificates for your STMP server, you can use the following settings.
+#
+MAIL_ALLOW_SELF_SIGNED=false
+MAIL_VERIFY_PEER=true
+MAIL_VERIFY_PEER_NAME=true
+
 # Other mail drivers:
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -99,7 +99,6 @@ class BasicController extends Controller
        $start        = $dates['start'];
        $end          = $dates['end'];
        $code         = $request->get('currency_code');
-
        // balance information:
        $balanceData  = $this->getBalanceInformation($start, $end);
        $billData     = $this->getSubscriptionInformation($start, $end);
@@ -471,30 +470,60 @@ class BasicController extends Controller
     */
    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
    {
-        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
-        $return    = [];
-        $today     = today(config('app.timezone'));
-        $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
-        $budgets   = $this->budgetRepository->getActiveBudgets();
-        $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
-        $days      = (int) $today->diffInDays($end, true) + 1;

+        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+        $return     = [];
+        $today      = today(config('app.timezone'));
+        $available  = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
+        $budgets    = $this->budgetRepository->getActiveBudgets();
+        $spent      = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
+        $days       = (int) $today->diffInDays($end, true) + 1;
+        $currencies = [];
+
+        // first, create an entry for each entry in the "available" array.
+        /** @var array $availableBudget */
+        foreach ($available as $currencyId =>  $availableBudget) {
+            $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
+            $return[$currencyId] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $currencies[$currencyId]->code),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currencies[$currencyId]->symbol]),
+                'no_available_budgets'    => false,
+                'monetary_value'          => $availableBudget,
+                'currency_id'             => (string) $currencies[$currencyId]->id,
+                'currency_code'           => $currencies[$currencyId]->code,
+                'currency_symbol'         => $currencies[$currencyId]->symbol,
+                'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'local_icon'              => 'money',
+                'sub_title'               => app('amount')->formatFlat(
+                    $currencies[$currencyId]->symbol,
+                    $currencies[$currencyId]->decimal_places,
+                    $availableBudget,
+                    false
+                ),
+            ];
+        }
        foreach ($spent as $row) {
            // either an amount was budgeted or 0 is available.
-            $currencyId      = $row['currency_id'];
-            $amount          = (string) ($available[$currencyId] ?? '0');
-            $spentInCurrency = $row['sum'];
-            $leftToSpend     = bcadd($amount, $spentInCurrency);
-            $perDay          = '0';
+            $currencyId          = (int) $row['currency_id'];
+            $amount              = (string) ($available[$currencyId] ?? '0');
+            if (0 === bccomp($amount, '0')) {
+                // #9858 skip over currencies with no available budget.
+                continue;
+            }
+            $spentInCurrency     = $row['sum'];
+            $leftToSpend         = bcadd($amount, $spentInCurrency);
+            $perDay              = '0';
            if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                $perDay = bcdiv($leftToSpend, (string) $days);
            }

            Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));

-            $return[]        = [
+            $return[$currencyId] = [
                'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
+                'no_available_budgets'    => false,
                'monetary_value'          => $leftToSpend,
                'currency_id'             => (string) $row['currency_id'],
                'currency_code'           => $row['currency_code'],
@@ -511,11 +540,12 @@ class BasicController extends Controller
            ];
        }
        if (0 === count($return)) {
-            $currency = $this->nativeCurrency;
-            $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,
@@ -531,7 +561,7 @@ class BasicController extends Controller
            ];
        }

-        return $return;
+        return array_values($return);
    }

    private function getNetWorthInfo(Carbon $end): array
--- a/app/Notifications/Admin/UnknownUserLoginAttempt.php
+++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php
@@ -80,9 +80,10 @@ class UnknownUserLoginAttempt extends Notification
    {
        $settings = ReturnsSettings::getSettings('ntfy', 'owner', null);
        $message  = new Message();
+        $ip       = Request::ip();
        $message->topic($settings['ntfy_topic']);
        $message->title((string) trans('email.unknown_user_subject'));
-        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address]));
+        $message->body((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]));

        return $message;
    }
@@ -92,7 +93,9 @@ class UnknownUserLoginAttempt extends Notification
     */
    public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
    {
-        return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
+        $ip = Request::ip();
+
+        return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]))
            ->title((string) trans('email.unknown_user_subject'))
        ;
    }
@@ -102,8 +105,10 @@ class UnknownUserLoginAttempt extends Notification
     */
    public function toSlack(OwnerNotifiable $notifiable): SlackMessage
    {
+        $ip = Request::ip();
+
        return new SlackMessage()->content(
-            (string) trans('email.unknown_user_body', ['address' => $this->address])
+            (string) trans('email.unknown_user_body', ['address' => $this->address, 'ip' => $ip])
        );
    }

--- a/app/Repositories/Budget/OperationsRepository.php
+++ b/app/Repositories/Budget/OperationsRepository.php
@@ -247,6 +247,6 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        }
        $summarizer = new TransactionSummarizer($this->user);

-        return $summarizer->groupByCurrencyId($journals);
+        return $summarizer->groupByCurrencyId($journals, 'negative', false);
    }
 }
--- a/composer.lock
+++ b/composer.lock
@@ -1010,16 +1010,16 @@
        },
        {
            "name": "firebase/php-jwt",
-            "version": "v6.11.0",
+            "version": "v6.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
-                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
+                "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
                "shasum": ""
            },
            "require": {
@@ -1067,9 +1067,9 @@
            ],
            "support": {
                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
            },
-            "time": "2025-01-23T05:11:06+00:00"
+            "time": "2025-04-09T20:32:01+00:00"
        },
        {
            "name": "fruitcake/php-cors",
@@ -3472,16 +3472,16 @@
        },
        {
            "name": "mailersend/laravel-driver",
-            "version": "v2.9.0",
+            "version": "v2.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/mailersend/mailersend-laravel-driver.git",
-                "reference": "a34e2db5d63d2421b055d8271066d204479a8b6a"
+                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/a34e2db5d63d2421b055d8271066d204479a8b6a",
-                "reference": "a34e2db5d63d2421b055d8271066d204479a8b6a",
+                "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/87fd5ab76808bbaac9221be0d306baef13e98725",
+                "reference": "87fd5ab76808bbaac9221be0d306baef13e98725",
                "shasum": ""
            },
            "require": {
@@ -3535,9 +3535,9 @@
            ],
            "support": {
                "issues": "https://github.com/mailersend/mailersend-laravel-driver/issues",
-                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.9.0"
+                "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.9.1"
            },
-            "time": "2025-04-04T10:38:10+00:00"
+            "time": "2025-04-09T09:33:07+00:00"
        },
        {
            "name": "mailersend/mailersend",
@@ -6361,16 +6361,16 @@
        },
        {
            "name": "spatie/laravel-package-tools",
-            "version": "1.92.0",
+            "version": "1.92.4",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "dd46cd0ed74015db28822d88ad2e667f4496a6f6"
+                "reference": "d20b1969f836d210459b78683d85c9cd5c5f508c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/dd46cd0ed74015db28822d88ad2e667f4496a6f6",
-                "reference": "dd46cd0ed74015db28822d88ad2e667f4496a6f6",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d20b1969f836d210459b78683d85c9cd5c5f508c",
+                "reference": "d20b1969f836d210459b78683d85c9cd5c5f508c",
                "shasum": ""
            },
            "require": {
@@ -6381,6 +6381,7 @@
                "mockery/mockery": "^1.5",
                "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
                "pestphp/pest": "^1.23|^2.1|^3.1",
+                "phpunit/php-code-coverage": "^9.0|^10.0|^11.0",
                "phpunit/phpunit": "^9.5.24|^10.5|^11.5",
                "spatie/pest-plugin-test-time": "^1.1|^2.2"
            },
@@ -6409,7 +6410,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.92.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.92.4"
            },
            "funding": [
                {
@@ -6417,7 +6418,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-03-27T08:34:10+00:00"
+            "time": "2025-04-11T15:27:14+00:00"
        },
        {
            "name": "spatie/period",
@@ -10029,16 +10030,16 @@
    "packages-dev": [
        {
            "name": "barryvdh/laravel-debugbar",
-            "version": "v3.15.2",
+            "version": "v3.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "0bc1e1361e7fffc2be156f46ad1fba6927c01729"
+                "reference": "4ccab20844d18c5af08b68d310e7151a791c3037"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/0bc1e1361e7fffc2be156f46ad1fba6927c01729",
-                "reference": "0bc1e1361e7fffc2be156f46ad1fba6927c01729",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/4ccab20844d18c5af08b68d310e7151a791c3037",
+                "reference": "4ccab20844d18c5af08b68d310e7151a791c3037",
                "shasum": ""
            },
            "require": {
@@ -10049,9 +10050,6 @@
                "php-debugbar/php-debugbar": "~2.1.1",
                "symfony/finder": "^6|^7"
            },
-            "conflict": {
-                "maximebf/debugbar": "*"
-            },
            "require-dev": {
                "mockery/mockery": "^1.3.3",
                "orchestra/testbench-dusk": "^7|^8|^9|^10",
@@ -10101,7 +10099,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.2"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.3"
            },
            "funding": [
                {
@@ -10113,7 +10111,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-25T15:25:22+00:00"
+            "time": "2025-04-08T15:11:06+00:00"
        },
        {
            "name": "barryvdh/laravel-ide-helper",
@@ -10263,16 +10261,16 @@
        },
        {
            "name": "cloudcreativity/json-api-testing",
-            "version": "v6.1.0",
+            "version": "v6.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/cloudcreativity/json-api-testing.git",
-                "reference": "6c7a09b75e4ea250983d5b80f6120f15db9914cb"
+                "reference": "bb2ff0a87013d40781ca7f959023491d6f1b4ed2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cloudcreativity/json-api-testing/zipball/6c7a09b75e4ea250983d5b80f6120f15db9914cb",
-                "reference": "6c7a09b75e4ea250983d5b80f6120f15db9914cb",
+                "url": "https://api.github.com/repos/cloudcreativity/json-api-testing/zipball/bb2ff0a87013d40781ca7f959023491d6f1b4ed2",
+                "reference": "bb2ff0a87013d40781ca7f959023491d6f1b4ed2",
                "shasum": ""
            },
            "require": {
@@ -10280,7 +10278,7 @@
                "illuminate/contracts": "^10.0|^11.0|^12.0",
                "illuminate/support": "^10.0|^11.0|^12.0",
                "php": "^8.2",
-                "phpunit/phpunit": "^10.5|^11.0"
+                "phpunit/phpunit": "^10.5|^11.0|^12.0"
            },
            "type": "library",
            "extra": {
@@ -10315,9 +10313,9 @@
            ],
            "support": {
                "issues": "https://github.com/cloudcreativity/json-api/issues",
-                "source": "https://github.com/cloudcreativity/json-api-testing/tree/v6.1.0"
+                "source": "https://github.com/cloudcreativity/json-api-testing/tree/v6.2.0"
            },
-            "time": "2025-02-24T20:34:56+00:00"
+            "time": "2025-04-09T19:15:46+00:00"
        },
        {
            "name": "composer/class-map-generator",
@@ -11703,16 +11701,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "11.5.15",
+            "version": "11.5.17",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c"
+                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
-                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
+                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
                "shasum": ""
            },
            "require": {
@@ -11784,7 +11782,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.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.17"
            },
            "funding": [
                {
@@ -11800,7 +11798,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-03-23T16:02:11+00:00"
+            "time": "2025-04-08T07:59:11+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-07',
+    'version'                      => 'develop/2025-04-14',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/config/mail.php
+++ b/config/mail.php
@@ -37,14 +37,19 @@ return [

    'mailers'  => [
        'smtp'       => [
-            'transport'   => 'smtp',
-            'host'        => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
-            'port'        => (int) env('MAIL_PORT', 2525),
-            'encryption'  => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
-            'username'    => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
-            'password'    => envNonEmpty('MAIL_PASSWORD', 'password'),
-            'timeout'     => null,
-            'verify_peer' => null !== env('MAIL_ENCRYPTION'),
+            'transport'         => 'smtp',
+            'host'              => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
+            'port'              => (int) env('MAIL_PORT', 2525),
+            'encryption'        => envNonEmpty('MAIL_ENCRYPTION', 'tls'),
+            'username'          => envNonEmpty('MAIL_USERNAME', 'user@example.com'),
+            'password'          => envNonEmpty('MAIL_PASSWORD', 'password'),
+            'timeout'           => null,
+            'scheme'            => env('MAIL_SCHEME'),
+            'url'               => env('MAIL_URL'),
+            'local_domain'      => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+            'verify_peer'       => env('MAIL_VERIFY_PEER', true),
+            'allow_self_signed' => env('MAIL_ALLOW_SELF_SIGNED', false),
+            'verify_peer_name'  => env('MAIL_VERIFY_PEER_NAME', true),
        ],
        'mailersend' => [
            'transport' => 'mailersend',
--- a/package-lock.json
+++ b/package-lock.json
@@ -2555,9 +2555,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz",
-            "integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
+            "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
            "cpu": [
                "arm"
            ],
@@ -2569,9 +2569,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz",
-            "integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
+            "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
            "cpu": [
                "arm64"
            ],
@@ -2583,9 +2583,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz",
-            "integrity": "sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
+            "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
            "cpu": [
                "arm64"
            ],
@@ -2597,9 +2597,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz",
-            "integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
+            "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
            "cpu": [
                "x64"
            ],
@@ -2611,9 +2611,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz",
-            "integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
+            "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
            "cpu": [
                "arm64"
            ],
@@ -2625,9 +2625,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz",
-            "integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
+            "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
            "cpu": [
                "x64"
            ],
@@ -2639,9 +2639,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz",
-            "integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
+            "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
            "cpu": [
                "arm"
            ],
@@ -2653,9 +2653,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz",
-            "integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
+            "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
            "cpu": [
                "arm"
            ],
@@ -2667,9 +2667,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
-            "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
+            "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
            "cpu": [
                "arm64"
            ],
@@ -2681,9 +2681,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz",
-            "integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
+            "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
            "cpu": [
                "arm64"
            ],
@@ -2695,9 +2695,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz",
-            "integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
+            "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
            "cpu": [
                "loong64"
            ],
@@ -2709,9 +2709,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz",
-            "integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
+            "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
            "cpu": [
                "ppc64"
            ],
@@ -2723,9 +2723,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz",
-            "integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
+            "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
            "cpu": [
                "riscv64"
            ],
@@ -2737,9 +2737,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz",
-            "integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
+            "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
            "cpu": [
                "riscv64"
            ],
@@ -2751,9 +2751,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz",
-            "integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
+            "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
            "cpu": [
                "s390x"
            ],
@@ -2765,9 +2765,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
-            "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
+            "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
            "cpu": [
                "x64"
            ],
@@ -2779,9 +2779,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz",
-            "integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
+            "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
            "cpu": [
                "x64"
            ],
@@ -2793,9 +2793,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz",
-            "integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
+            "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
            "cpu": [
                "arm64"
            ],
@@ -2807,9 +2807,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz",
-            "integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
+            "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
            "cpu": [
                "ia32"
            ],
@@ -2821,9 +2821,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz",
-            "integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
+            "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
            "cpu": [
                "x64"
            ],
@@ -3111,9 +3111,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.14.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
-            "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
+            "version": "22.14.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
+            "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4420,9 +4420,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001712",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001712.tgz",
-            "integrity": "sha512-MBqPpGYYdQ7/hfKiet9SCI+nmN5/hp4ZzveOJubl5DTAMa5oggjAuoi0Z4onBpKPFI2ePGnQuQIzF3VxDjDJig==",
+            "version": "1.0.30001713",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001713.tgz",
+            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
            "dev": true,
            "funding": [
                {
@@ -5635,9 +5635,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.132",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.132.tgz",
-            "integrity": "sha512-QgX9EBvWGmvSRa74zqfnG7+Eno0Ak0vftBll0Pt2/z5b3bEGYL6OUXLgKPtvx73dn3dvwrlyVkjPKRRlhLYTEg==",
+            "version": "1.5.136",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz",
+            "integrity": "sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ==",
            "dev": true,
            "license": "ISC"
        },
@@ -6915,9 +6915,9 @@
            }
        },
        "node_modules/http-parser-js": {
-            "version": "0.5.9",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
-            "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==",
+            "version": "0.5.10",
+            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+            "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
            "dev": true,
            "license": "MIT"
        },
@@ -6937,9 +6937,9 @@
            }
        },
        "node_modules/http-proxy-middleware": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-            "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+            "version": "2.0.9",
+            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+            "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -9992,9 +9992,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.39.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.39.0.tgz",
-            "integrity": "sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==",
+            "version": "4.40.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
+            "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10008,26 +10008,26 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.39.0",
-                "@rollup/rollup-android-arm64": "4.39.0",
-                "@rollup/rollup-darwin-arm64": "4.39.0",
-                "@rollup/rollup-darwin-x64": "4.39.0",
-                "@rollup/rollup-freebsd-arm64": "4.39.0",
-                "@rollup/rollup-freebsd-x64": "4.39.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.39.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.39.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.39.0",
-                "@rollup/rollup-linux-arm64-musl": "4.39.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.39.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.39.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.39.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.39.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.39.0",
-                "@rollup/rollup-linux-x64-gnu": "4.39.0",
-                "@rollup/rollup-linux-x64-musl": "4.39.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.39.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.39.0",
-                "@rollup/rollup-win32-x64-msvc": "4.39.0",
+                "@rollup/rollup-android-arm-eabi": "4.40.0",
+                "@rollup/rollup-android-arm64": "4.40.0",
+                "@rollup/rollup-darwin-arm64": "4.40.0",
+                "@rollup/rollup-darwin-x64": "4.40.0",
+                "@rollup/rollup-freebsd-arm64": "4.40.0",
+                "@rollup/rollup-freebsd-x64": "4.40.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.40.0",
+                "@rollup/rollup-linux-arm64-musl": "4.40.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.40.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.40.0",
+                "@rollup/rollup-linux-x64-gnu": "4.40.0",
+                "@rollup/rollup-linux-x64-musl": "4.40.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.40.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.40.0",
+                "@rollup/rollup-win32-x64-msvc": "4.40.0",
                "fsevents": "~2.3.2"
            }
        },
@@ -11304,9 +11304,9 @@
            }
        },
        "node_modules/vite": {
-            "version": "6.2.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.5.tgz",
-            "integrity": "sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==",
+            "version": "6.2.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz",
+            "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11593,9 +11593,9 @@
            "license": "BSD-2-Clause"
        },
        "node_modules/webpack": {
-            "version": "5.98.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
-            "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
+            "version": "5.99.5",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.5.tgz",
+            "integrity": "sha512-q+vHBa6H9qwBLUlHL4Y7L0L1/LlyBKZtS9FHNCQmtayxjI5RKC9yD8gpvLeqGv5lCQp1Re04yi0MF40pf30Pvg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/public/v1/js/ff/index.js
+++ b/public/v1/js/ff/index.js
@@ -80,11 +80,18 @@ 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 (parseFloat(data[key].monetary_value) > 0) {
+                    if(true === data[key].no_available_budgets) {
+                        left_to_spend_top.push('---');
+                        left_to_spend_bottom.push('---');
                        keepGreen = true;
                    }
+                    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;
+                        }
+                    }
                }

                // net worth
--- a/resources/assets/v1/src/locales/cs.json
+++ b/resources/assets/v1/src/locales/cs.json
@@ -103,7 +103,7 @@
        "profile_oauth_confidential": "Soukrom\u00e1 aplikace",
        "profile_oauth_confidential_help": "Po\u017eadovat aby se klienti autorizovali. Soukrom\u00e9 aplikace mohou bezpe\u010dn\u011b pracovat s p\u0159\u00edstupov\u00fdmi \u00fadaji bez toho aby je zve\u0159ejnily. Ve\u0159ejn\u00e9 aplikace, nativn\u00ed nebo JavaScriptov\u00e9 SPA, toho schopn\u00e9 nejsou.",
        "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
-        "multi_account_warning_withdrawal": "Zdrojov\u00fd \u00fa\u010del v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed je ovl\u00e1dan\u00fd zdrojov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
+        "multi_account_warning_withdrawal": "Zdrojov\u00fd \u00fa\u010det cel\u00e9 transakce je ovl\u00e1dan\u00fd prvn\u00edm rozd\u011blen\u00edm.",
        "multi_account_warning_deposit": "C\u00edlov\u00fd \u00fa\u010del v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed je ovl\u00e1dan\u00fd c\u00edlov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
        "multi_account_warning_transfer": "Zdrojov\u00fd i c\u00edlov\u00fd \u00fa\u010det v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed jsou ovl\u00e1d\u00e1ny zdrojov\u00fdm a c\u00edlov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",
        "webhook_trigger_STORE_TRANSACTION": "Po vytvo\u0159en\u00ed transakce",
--- a/resources/assets/v1/src/locales/zh-cn.json
+++ b/resources/assets/v1/src/locales/zh-cn.json
@@ -3,8 +3,8 @@
        "administrations_page_title": "\u8d22\u52a1\u7ba1\u7406",
        "administrations_index_menu": "\u8d22\u52a1\u7ba1\u7406",
        "temp_administrations_introduction": "Firefly III \u4e0d\u4e45\u5c06\u80fd\u591f\u7ba1\u7406\u591a\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002 \u73b0\u5728\uff0c\u4f60\u53ea\u80fd\u6709\u4e00\u4e2a\u8d22\u52a1\u7ba1\u7406\u3002\u4f60\u53ef\u4ee5\u8bbe\u7f6e\u8fd9\u4e2a\u8d22\u52a1\u7ba1\u7406\u7684\u6807\u9898\u53ca\u5176\u5f53\u5730\u8d27\u5e01\u3002 \u8fd9\u5c06\u53d6\u4ee3\u60a8\u5148\u524d\u8bbe\u7f6e\u7684\u201c\u9ed8\u8ba4\u8d27\u5e01\u201d\u3002 \u8fd9\u79cd\u8bbe\u7f6e\u73b0\u5728\u4e0e\u8d22\u52a1\u7ba1\u7406\u6302\u94a9\uff0c\u6bcf\u4e2a\u7ba1\u7406\u53ef\u4ee5\u6709\u4e0d\u540c\u7684\u8bbe\u7f6e\u3002",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administration_currency_form_help": "\u5982\u679c\u60a8\u66f4\u6539\u672c\u5730\u8d27\u5e01\uff0c\u9875\u9762\u52a0\u8f7d\u53ef\u80fd\u9700\u8981\u5f88\u957f\u65f6\u95f4\uff0c\u56e0\u4e3a\u4ea4\u6613\u53ef\u80fd\u9700\u8981\u8f6c\u6362\u4e3a\u60a8\u7684(\u65b0)\u672c\u5730\u8d27\u5e01\u3002",
+        "administrations_page_edit_sub_title_js": "\u7f16\u8f91\u8d22\u52a1\u7ba1\u7406{title}",
        "table": "\u8868\u683c",
        "welcome_back": "\u4eca\u5929\u7406\u8d22\u4e86\u5417\uff1f",
        "flash_error": "\u9519\u8bef\uff01",
@@ -140,12 +140,12 @@
        "visit_webhook_url": "\u8bbf\u95ee webhook URL",
        "reset_webhook_secret": "\u91cd\u7f6e webhook \u5bc6\u94a5",
        "header_exchange_rates": "\u6c47\u7387",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
+        "exchange_rates_intro": "Frefly III \u652f\u6301\u4e0b\u8f7d\u548c\u4f7f\u7528\u6c47\u7387\u3002\u8bf7\u5728 <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">\u8fd9\u4efd\u6587\u6863<\/a>\u4e2d\u9605\u8bfb\u66f4\u591a\u3002",
+        "exchange_rates_from_to": "\u4ece {from} \u5230 {to} \u7684\u6c47\u7387\uff08\u4ee5\u53ca\u53cd\u5411\uff09",
+        "exchange_rates_intro_rates": "Firefly III \u91c7\u7528\u4ee5\u4e0b\u6c47\u7387\u3002\u5982\u679c\u6ca1\u6709\u63d0\u4f9b\u53cd\u5411\u6c47\u7387\u5219\u81ea\u52a8\u8ba1\u7b97\u3002 \u5982\u679c\u4ea4\u6613\u65e5\u671f\u4e0d\u5b58\u5728\u6c47\u7387\uff0cFifrefly III \u5c06\u5bfb\u627e\u524d\u4e00\u4e2a\u53ef\u7528\u65e5\u671f\u7684\u6c47\u7387\u3002 \u5982\u679c\u6ca1\u6709\uff0c\u5c06\u6309\u6c47\u7387\u4e3a 1 \u8fdb\u884c\u8ba1\u7b97\u3002",
        "header_exchange_rates_rates": "\u6c47\u7387",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
+        "header_exchange_rates_table": "\u6c47\u7387\u8868",
+        "help_rate_form": "\u5728\u8fd9\u4e00\u5929\uff0c\u4f60\u80fd\u4ece\u6bcf 1 \u4e2a\u5355\u4f4d\u7684 {from} \u83b7\u5f97\u591a\u5c11 {to}\uff1f",
        "add_new_rate": "\u6dfb\u52a0\u65b0\u6c47\u7387",
        "save_new_rate": "\u4fdd\u5b58\u65b0\u6c47\u7387"
    },
--- a/resources/lang/en_US/email.php
+++ b/resources/lang/en_US/email.php
@@ -64,8 +64,8 @@ return [

    // unknown user login attempt
    'unknown_user_subject'                        => 'An unknown user tried to log in',
-    'unknown_user_body'                           => 'An unknown user tried to log in to Firefly III. The email address they used was ":address".',
-    'unknown_user_message'                        => 'The email address they used was ":address".',
+    'unknown_user_body'                           => 'An unknown user (:ip) tried to log in to Firefly III. The email address they used was ":address".',
+    'unknown_user_message'                        => 'The email address they (:ip) used was ":address".',

    // known user login attempt
    'failed_login_subject'                        => 'Firefly III detected a failed login attempt',
Author	SHA1	Message	Date
github-actions[bot]	11c38a599b	Merge pull request #10127 from firefly-iii/release-1744600947 🤖 Automatically merge the PR into the develop branch.	2025-04-14 05:22:37 +02:00
JC5	0ce245f480	🤖 Auto commit for release 'develop' on 2025-04-14	2025-04-14 05:22:27 +02:00
github-actions[bot]	aef15cf3d3	Merge pull request #10119 from firefly-iii/release-1744394417 🤖 Automatically merge the PR into the develop branch.	2025-04-11 20:00:28 +02:00
JC5	d1880de30e	🤖 Auto commit for release 'develop' on 2025-04-11	2025-04-11 20:00:17 +02:00
James Cole	9d900a69ed	Merge pull request #10118 from firefly-iii/main Merge security improvements.	2025-04-11 19:45:15 +02:00
James Cole	1653f77b15	Merge pull request #10117 from firefly-iii/fix-10114 Possible fix for #10114	2025-04-11 19:40:36 +02:00
James Cole	9418436d51	Possible fix for #10114	2025-04-11 19:38:48 +02:00
James Cole	1c9a6a194a	Merge pull request #10115 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-b7c6efa8f1	2025-04-11 18:59:39 +02:00
dependabot[bot]	11cfb5a962	Bump vite in the npm_and_yarn group across 1 directory Bumps the npm_and_yarn group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite). Updates `vite` from 6.2.5 to 6.2.6 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v6.2.6/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v6.2.6/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-version: 6.2.6 dependency-type: direct:development dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-11 15:37:30 +00:00
James Cole	7d21467447	Merge pull request #10110 from firefly-iii/add-ip Add IP to failed login message.	2025-04-09 21:28:34 +02:00
James Cole	5ce9f32deb	Add IP to failed login message.	2025-04-09 21:26:29 +02:00
James Cole	337440259f	Merge pull request #10109 from firefly-iii/fix-9398 Fix #9398	2025-04-07 20:43:37 +02:00
James Cole	c483e0768f	Fix #9398	2025-04-07 20:42:52 +02:00
James Cole	fd9b0d9417	Merge pull request #10108 from firefly-iii/fix-9858 Whoops	2025-04-07 19:48:52 +02:00
James Cole	c3165f4937	Whoops	2025-04-07 19:48:30 +02:00
James Cole	a5c9adc872	Merge pull request #10107 from firefly-iii/fix-9858 Fix #9858	2025-04-07 19:45:33 +02:00
James Cole	59cc007931	Fix #9858	2025-04-07 19:44:22 +02:00