Merge pull request #12183 from firefly-iii/release-1777088715

🤖 Automatically merge the PR into the develop branch.

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.
 
 ## 2026
+- tasnim0tantawi
 - Joe Longendyke
 - Daniel Holøien
 - Matthew Grove

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -158,10 +158,7 @@ final class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd(
-                        (string) $response[$foreignKey]['difference'],
-                        Steam::positive($journal['foreign_amount'])
-                    );
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }
             }

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -155,10 +155,7 @@ final class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd(
-                        (string) $response[$foreignKey]['difference'],
-                        Steam::positive($journal['foreign_amount'])
-                    );
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }
             }

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -49,7 +49,7 @@ class StoreRequest extends FormRequest
      */
     public function getAll(): array
     {
-        $fields                            = ['order'                            => ['order', 'convertInteger']];
+        $fields                            = ['order' => ['order', 'convertInteger']];
         $data                              = $this->getAllData($fields);
         $data['name']                      = $this->convertString('name');
         $data['accounts']                  = $this->parseAccounts($this->get('accounts'));

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -70,7 +70,7 @@ class UpdateRequest extends FormRequest
         ];
         $reps                   = $this->getRepetitionData();
         $transactions           = $this->getTransactionData();
-        $return                 = ['recurrence'       => $this->getAllData($fields)];
+        $return                 = ['recurrence' => $this->getAllData($fields)];
         if (null !== $reps) {
             $return['repetitions'] = $reps;
         }

app/Console/Commands/Tools/Cron.php

@@ -57,12 +57,13 @@ class Cron extends Command
 
     public function handle(): int
     {
-        $doAll = !$this->option('download-cer')
-        && !$this->option('create-recurring')
-        && !$this->option('create-auto-budgets')
-        && !$this->option('send-subscription-warnings')
-        && !$this->option('check-version')
-        && !$this->option('send-webhook-messages');
+        $doAll
+               = !$this->option('download-cer')
+            && !$this->option('create-recurring')
+            && !$this->option('create-auto-budgets')
+            && !$this->option('send-subscription-warnings')
+            && !$this->option('check-version')
+            && !$this->option('send-webhook-messages');
         $date  = null;
 
         try {

app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php

@@ -48,10 +48,12 @@ class TransactionGroupEventObjects
 
     public function appendFromTransactionGroup(TransactionGroup $transactionGroup): void
     {
+        Log::debug(sprintf('Appended transaction group #%d', $transactionGroup->id));
         $this->transactionGroups->push($transactionGroup);
 
         /** @var TransactionJournal $journal */
         foreach ($transactionGroup->transactionJournals as $journal) {
+            Log::debug(sprintf('Appended transaction journal #%d', $journal->id));
             $this->transactionJournals->push($journal);
             $this->budgets    = $this->budgets->merge($journal->budgets);
             $this->categories = $this->categories->merge($journal->categories);
@@ -59,6 +61,7 @@ class TransactionGroupEventObjects
 
             /** @var Transaction $transaction */
             foreach ($journal->transactions as $transaction) {
+                Log::debug(sprintf('Appended account #%d', $transaction->account->id));
                 $this->accounts->push($transaction->account);
             }
         }
@@ -69,4 +72,25 @@ class TransactionGroupEventObjects
         $this->tags                = $this->tags->unique('id');
         $this->accounts            = $this->accounts->unique('id');
     }
+
+    public function collectFromCollection(Collection $collection): void
+    {
+        Log::debug('Will now collect info from collection.');
+
+        /** @var array|TransactionGroup $object */
+        foreach ($collection as $object) {
+            if ($object instanceof TransactionGroup) {
+                Log::debug(sprintf('Added group #%d', $object->id));
+                $this->appendFromTransactionGroup($object);
+            }
+            if (is_array($object) && array_key_exists('id', $object)) {
+                // FIXME technically speaking not sure of this is the user's transaction group.
+                $group = TransactionGroup::find((int) $object['id']);
+                if (null !== $group) {
+                    Log::debug(sprintf('Added group #%d', $group->id));
+                    $this->appendFromTransactionGroup($group);
+                }
+            }
+        }
+    }
 }

app/Factory/TransactionFactory.php

@@ -192,10 +192,12 @@ class TransactionFactory
             return;
         }
         // validate info:
-        $validator = Validator::make(['iban' => $this->accountInformation['iban']], ['iban' => [
-            'required',
-            new UniqueIban($this->account, $this->account->accountType->type),
-        ]]);
+        $validator = Validator::make(['iban' => $this->accountInformation['iban']], [
+            'iban' => [
+                'required',
+                new UniqueIban($this->account, $this->account->accountType->type),
+            ],
+        ]);
         if ($validator->fails()) {
             Log::debug('Invalid or non-unique IBAN, will not update.');
 

app/Helpers/Functions/helpers.php

@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * helpers.php
+ * Copyright (c) 2026 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/>.
+ */
+
+declare(strict_types=1);
+
+use FireflyIII\Exceptions\FireflyException;
+
+use function Safe\mb_ord;
+use function Safe\preg_match;
+use function Safe\preg_replace_callback;
+
+if (!function_exists('env_default_when_empty')) {
+    /**
+     * @return null|mixed
+     */
+    function env_default_when_empty(mixed $value, bool|int|string|null $default = null): mixed
+    {
+        if (null === $value) {
+            return $default;
+        }
+        if ('' === $value) {
+            return $default;
+        }
+
+        return $value;
+    }
+}
+
+if (!function_exists('string_is_equal')) {
+    function string_is_equal(string $left, string $right): bool
+    {
+        return $left === $right;
+    }
+}
+
+if (!function_exists('blade_escape_js')) {
+    function blade_escape_js(string $string): string
+    {
+        // escape all non-alphanumeric characters
+        // into their \x or \uHHHH representations
+        if (0 === preg_match('//u', $string)) {
+            throw new FireflyException('The string to escape is not a valid UTF-8 string.');
+        }
+
+        return preg_replace_callback(
+            '#[^a-zA-Z0-9,\._]#Su',
+            static function ($matches) {
+                $char      = $matches[0];
+
+                /*
+                 * A few characters have short escape sequences in JSON and JavaScript.
+                 * Escape sequences supported only by JavaScript, not JSON, are omitted.
+                 * \" is also supported but omitted, because the resulting string is not HTML safe.
+                 */
+                $short     = match ($char) {
+                    '\\'    => '\\\\',
+                    '/'     => '\/',
+                    "\x08"  => '\b',
+                    "\x0C"  => '\f',
+                    "\x0A"  => '\n',
+                    "\x0D"  => '\r',
+                    "\x09"  => '\t',
+                    default => false
+                };
+
+                if ($short) {
+                    return $short;
+                }
+
+                $codepoint = mb_ord($char, 'UTF-8');
+                if (0x10_000 > $codepoint) {
+                    return \sprintf('\u%04X', $codepoint);
+                }
+
+                // Split characters outside the BMP into surrogate pairs
+                // https://tools.ietf.org/html/rfc2781.html#section-2.1
+                $u         = $codepoint - 0x10_000;
+                $high      = 0xD800 | ($u >> 10);
+                $low       = 0xDC00 | ($u & 0x3FF);
+
+                return \sprintf('\u%04X\u%04X', $high, $low);
+            },
+            $string
+        );
+    }
+}

app/Helpers/Report/ReportHelper.php

@@ -56,7 +56,7 @@ class ReportHelper implements ReportHelperInterface
         /** @var BillRepositoryInterface $repository */
         $repository = app(BillRepositoryInterface::class);
         $bills      = $repository->getBillsForAccounts($accounts);
-        $report     = ['bills'     => []];
+        $report     = ['bills' => []];
 
         /** @var Bill $bill */
         foreach ($bills as $bill) {

app/Http/Controllers/Account/CreateController.php

@@ -78,12 +78,14 @@ final class CreateController extends Controller
         $roles               = $this->getRoles();
         $liabilityTypes      = $this->getLiabilityTypes();
         $hasOldInput         = null !== $request->old('_token');
-        $locations           = ['location'           => [
-            'latitude'     => $hasOldInput ? old('location_latitude') : config('firefly.default_location.latitude'),
-            'longitude'    => $hasOldInput ? old('location_longitude') : config('firefly.default_location.longitude'),
-            'zoom_level'   => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'),
-            'has_location' => $hasOldInput && 'true' === old('location_has_location'),
-        ]];
+        $locations           = [
+            'location' => [
+                'latitude'     => $hasOldInput ? old('location_latitude') : config('firefly.default_location.latitude'),
+                'longitude'    => $hasOldInput ? old('location_longitude') : config('firefly.default_location.longitude'),
+                'zoom_level'   => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'),
+                'has_location' => $hasOldInput && 'true' === old('location_has_location'),
+            ],
+        ];
         $liabilityDirections = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')];
 
         // interest calculation periods:

app/Http/Controllers/Account/EditController.php

@@ -96,12 +96,14 @@ final class EditController extends Controller
         $zoomLevel            = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
         $canEditCurrency      = 0 === $account->piggyBanks()->count();
         $hasLocation          = $location instanceof Location;
-        $locations            = ['location'       => [
-            'latitude'     => old('location_latitude') ?? $latitude,
-            'longitude'    => old('location_longitude') ?? $longitude,
-            'zoom_level'   => old('location_zoom_level') ?? $zoomLevel,
-            'has_location' => $hasLocation || 'true' === old('location_has_location'),
-        ]];
+        $locations            = [
+            'location' => [
+                'latitude'     => old('location_latitude') ?? $latitude,
+                'longitude'    => old('location_longitude') ?? $longitude,
+                'zoom_level'   => old('location_zoom_level') ?? $zoomLevel,
+                'has_location' => $hasLocation || 'true' === old('location_has_location'),
+            ],
+        ];
 
         $liabilityDirections  = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')];
 

app/Http/Controllers/Bill/IndexController.php

@@ -255,10 +255,7 @@ final class IndexController extends Controller
                     if (count($bill['paid_dates']) < count($bill['pay_dates'])) {
                         $count = count($bill['pay_dates']) - count($bill['paid_dates']);
                         if ($count > 0) {
-                            $avg                                                 = bcdiv(
-                                bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),
-                                '2'
-                            );
+                            $avg                                                 = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
                             $avg                                                 = bcmul($avg, (string) $count);
                             $sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);
                             Log::debug(

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controller
         if ($request->expectsJson()) {
             $array                           = $limit->toArray();
             // add some extra metadata:
-            $spentArr                        = $this->opsRepository->sumExpenses(
-                $limit->start_date,
-                $limit->end_date,
-                null,
-                new Collection()->push($budget),
-                $currency
-            );
+            $spentArr                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
             $array['spent']                  = $spentArr[$currency->id]['sum'] ?? '0';
             $array['left_formatted']         = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
             $array['amount_formatted']       = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);

app/Http/Controllers/Budget/IndexController.php

@@ -245,7 +245,13 @@ final class IndexController extends Controller
                 $inPast                       = $limitPeriod->startsBefore(now()) && $limitPeriod->endsBefore(now());
                 $currency                     = $limit->transactionCurrency ?? $primaryCurrency;
                 $amount                       = Steam::bcround($limit->amount, $currency->decimal_places);
-                $spent                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
+                $spent                        = $this->opsRepository->sumExpenses(
+                    $limit->start_date,
+                    $limit->end_date,
+                    null,
+                    new Collection()->push($budget),
+                    $currency
+                );
                 $spentAmount                  = $spent[$currency->id]['sum'] ?? '0';
                 $array['budgeted'][]          = [
                     'id'                      => $limit->id,
@@ -283,10 +289,7 @@ final class IndexController extends Controller
 
                 if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                     $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
-                    $array['spent'][$currency->id]['spent_outside']           = bcmul(
-                        bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']),
-                        '-1'
-                    );
+                    $array['spent'][$currency->id]['spent_outside']           = bcmul(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']), '-1');
                     $array['spent'][$currency->id]['currency_id']             = $currency->id;
                     $array['spent'][$currency->id]['currency_symbol']         = $currency->symbol;
                     $array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;

app/Http/Controllers/Chart/BudgetController.php

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

app/Http/Controllers/JavascriptController.php

@@ -59,7 +59,7 @@ final class JavascriptController extends Controller
             AccountTypeEnum::MORTGAGE->value,
             AccountTypeEnum::CREDITCARD->value,
         ]);
-        $data     = ['accounts'     => []];
+        $data     = ['accounts' => []];
 
         /** @var Account $account */
         foreach ($accounts as $account) {
@@ -79,7 +79,7 @@ final class JavascriptController extends Controller
     public function currencies(CurrencyRepositoryInterface $repository): Response
     {
         $currencies = $repository->get();
-        $data       = ['currencies'       => []];
+        $data       = ['currencies' => []];
 
         /** @var TransactionCurrency $currency */
         foreach ($currencies as $currency) {

app/Http/Controllers/Profile/OAuthController.php

@@ -115,6 +115,9 @@ final class OAuthController extends Controller
 
     public function listClients(): JsonResponse
     {
+        if (!auth()->check()) {
+            return response()->json([]);
+        }
         Log::debug('Now in listClients()');
         // Retrieving all the OAuth app clients that belong to the user...
         $clients = auth()->user()->oauthApps()->where('revoked', false)->get();

app/Http/Controllers/TagController.php

@@ -82,12 +82,14 @@ final class TagController extends Controller
 
         // location info:
         $hasOldInput  = null !== $request->old('_token');
-        $locations    = ['location'   => [
-            'latitude'     => $hasOldInput ? old('location_latitude') : config('firefly.default_location.latitude'),
-            'longitude'    => $hasOldInput ? old('location_longitude') : config('firefly.default_location.longitude'),
-            'zoom_level'   => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'),
-            'has_location' => $hasOldInput && 'true' === old('location_has_location'),
-        ]];
+        $locations    = [
+            'location' => [
+                'latitude'     => $hasOldInput ? old('location_latitude') : config('firefly.default_location.latitude'),
+                'longitude'    => $hasOldInput ? old('location_longitude') : config('firefly.default_location.longitude'),
+                'zoom_level'   => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'),
+                'has_location' => $hasOldInput && 'true' === old('location_has_location'),
+            ],
+        ];
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('tags.create.fromStore')) {
@@ -142,12 +144,14 @@ final class TagController extends Controller
         $longitude    = $location instanceof Location ? $location->longitude : config('firefly.default_location.longitude');
         $zoomLevel    = $location instanceof Location ? $location->zoom_level : config('firefly.default_location.zoom_level');
         $hasLocation  = $location instanceof Location;
-        $locations    = ['location'   => [
-            'latitude'     => old('location_latitude') ?? $latitude,
-            'longitude'    => old('location_longitude') ?? $longitude,
-            'zoom_level'   => old('location_zoom_level') ?? $zoomLevel,
-            'has_location' => $hasLocation || 'true' === old('location_has_location'),
-        ]];
+        $locations    = [
+            'location' => [
+                'latitude'     => old('location_latitude') ?? $latitude,
+                'longitude'    => old('location_longitude') ?? $longitude,
+                'zoom_level'   => old('location_zoom_level') ?? $zoomLevel,
+                'has_location' => $hasLocation || 'true' === old('location_has_location'),
+            ],
+        ];
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('tags.edit.fromUpdate')) {

app/Http/Controllers/TransactionCurrency/DeleteController.php

@@ -82,7 +82,7 @@ final class DeleteController extends Controller
 
         if ($this->repository->currencyInUse($currency)) {
             $location = $this->repository->currencyInUseAt($currency);
-            $message  = (string) trans(sprintf('firefly.cannot_disable_currency_%s', $location), ['name'  => e($currency->name)]);
+            $message  = (string) trans(sprintf('firefly.cannot_disable_currency_%s', $location), ['name' => e($currency->name)]);
             $request->session()->flash('error', $message);
             Log::channel('audit')->warning(sprintf('Tried to visit page to delete currency %s but currency is in use.', $currency->code));
 

app/Http/Middleware/SecureHeaders.php

@@ -63,7 +63,7 @@ class SecureHeaders
             "base-uri 'self'",
             // "form-action 'self'", // safe
             "font-src 'self' data:",
-            sprintf("connect-src 'self' %s", $trackingScriptSrc),
+            sprintf("connect-src 'self' https://api.pwnedpasswords.com %s", $trackingScriptSrc),
             sprintf("img-src 'self' data: 'nonce-%1s' ", $nonce),
             "manifest-src 'self'",
         ];

app/Jobs/CreateAutoBudgetLimits.php

@@ -122,13 +122,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository      = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent           = $repository->sumExpenses(
-            $previousStart,
-            $previousEnd,
-            null,
-            new Collection()->push($autoBudget->budget),
-            $autoBudget->transactionCurrency
-        );
+        $spent           = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId      = $autoBudget->transaction_currency_id;
         $spentAmount     = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -218,13 +212,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository    = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent         = $repository->sumExpenses(
-            $previousStart,
-            $previousEnd,
-            null,
-            new Collection()->push($autoBudget->budget),
-            $autoBudget->transactionCurrency
-        );
+        $spent         = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId    = $autoBudget->transaction_currency_id;
         $spentAmount   = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -98,7 +98,7 @@ trait ModifiesPiggyBanks
         $maxAmount     = $leftOnAccount;
 
         Log::debug(sprintf('Left on account: %s on %s', $leftOnAccount, $today->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('Saved so far: %s', $savedSoFar));
+        Log::debug(sprintf('Saved so far   : %s', $savedSoFar));
 
         if (0 !== bccomp($piggyBank->target_amount, '0')) {
             $leftToSave = bcsub($piggyBank->target_amount, (string) $savedSoFar);
@@ -110,7 +110,7 @@ trait ModifiesPiggyBanks
         $compare       = bccomp($amount, (string) $maxAmount);
         $result        = $compare <= 0;
 
-        Log::debug(sprintf('Compare <= 0? %d, so canAddAmount is %s', $compare, var_export($result, true)));
+        Log::debug(sprintf('Compare %s to %s <= 0? %d, so canAddAmount is %s', $amount, $maxAmount, $compare, var_export($result, true)));
 
         return $result;
     }

app/Rules/PiggyBank/IsEnoughInAccounts.php

@@ -54,8 +54,9 @@ class IsEnoughInAccounts implements ValidationRule
 
         $accounts   = $this->data['accounts'];
         foreach ($accounts as $info) {
-            $account = $repository->find((int) $info['account_id']);
-            $amount  = $info['current_amount'] ?? '0';
+            $account    = $repository->find((int) $info['account_id']);
+            $amount     = $info['current_amount'] ?? '0';
+            $savedSoFar = $piggyRepos->getCurrentAmount($this->piggyBank, $account);
             if (null === $account) {
                 $fail('validation.no_asset_account')->translate();
 
@@ -64,8 +65,8 @@ class IsEnoughInAccounts implements ValidationRule
             if ('' === $amount || 0 === bccomp($amount, '0')) {
                 continue;
             }
-            $diff    = bcsub($amount, $piggyRepos->getCurrentAmount($this->piggyBank, $account));
-            if (1 === bccomp($diff, '0') && !$piggyRepos->canAddAmount($this->piggyBank, $account, $amount)) {
+            $diff       = bcsub($amount, $savedSoFar);
+            if (1 === bccomp($diff, '0') && !$piggyRepos->canAddAmount($this->piggyBank, $account, $diff)) {
                 $fail('validation.cannot_add_piggy_amount')->translate();
             }
         }

app/Support/Form/PiggyBankForm.php

@@ -49,7 +49,7 @@ class PiggyBankForm
         $piggyBanks = $repository->getPiggyBanksWithAmount();
         $title      = (string) trans('firefly.default_group_title_name');
         $array      = [];
-        $subList    = [0    => ['group' => ['title' => $title], 'piggies' => [(string) trans('firefly.none_in_select_list')]]];
+        $subList    = [0 => ['group' => ['title' => $title], 'piggies' => [(string) trans('firefly.none_in_select_list')]]];
 
         /** @var PiggyBank $piggy */
         foreach ($piggyBanks as $piggy) {

app/Support/Http/Controllers/AugumentData.php

@@ -222,14 +222,7 @@ trait AugumentData
                 $currentEnd->addMonth();
             }
             // primary currency amount.
-            $expenses        = $opsRepository->sumExpenses(
-                $currentStart,
-                $currentEnd,
-                null,
-                $budgetCollection,
-                $entry->transactionCurrency,
-                $this->convertToPrimary
-            );
+            $expenses        = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);
             $spent           = $expenses[$currency->id]['sum'] ?? '0';
             $entry->pc_spent = $spent;
 

app/Support/Http/Controllers/CreateStuff.php

@@ -117,7 +117,7 @@ trait CreateStuff
         /** @var AccountRepositoryInterface $repository */
         $repository     = app(AccountRepositoryInterface::class);
         $savingsAccount = [
-            'name'                 => (string) trans('firefly.new_savings_account', ['bank_name'                 => $request->get('bank_name')], $language),
+            'name'                 => (string) trans('firefly.new_savings_account', ['bank_name' => $request->get('bank_name')], $language),
             'iban'                 => null,
             'account_type_name'    => 'asset',
             'account_type_id'      => null,

app/Support/JsonApi/Enrichments/RecurringEnrichment.php

@@ -354,10 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface
 
         /** @var RecurrenceRepetition $repetition */
         foreach ($set as $repetition) {
-            $recurrence                               = $this->collection
-                ->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)
-                ->first()
-            ;
+            $recurrence                               = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();
             $fromDate                                 = clone ($recurrence->latest_date ?? $recurrence->first_date);
             $recurrenceId                             = (int) $repetition->recurrence_id;
             $repId                                    = (int) $repetition->id;

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -470,10 +470,9 @@ class SubscriptionEnrichment implements EnrichmentInterface
             } catch (InvalidFormatException) {
                 $temp2 = today(config('app.timezone'));
             }
-            $nemDiff = trans('firefly.bill_expected_date', ['date' => $temp2->diffForHumans(
-                today(config('app.timezone')),
-                CarbonInterface::DIFF_RELATIVE_TO_NOW
-            )]);
+            $nemDiff = trans('firefly.bill_expected_date', [
+                'date' => $temp2->diffForHumans(today(config('app.timezone')), CarbonInterface::DIFF_RELATIVE_TO_NOW),
+            ]);
         }
         unset($temp2);
 

app/Support/Search/OperatorQuerySearch.php

@@ -522,7 +522,7 @@ class OperatorQuerySearch implements SearchInterface
             $stringMethod = 'str_contains';
         }
         if (StringPosition::IS === $stringPosition) {
-            $stringMethod = 'stringIsEqual';
+            $stringMethod = 'string_is_equal';
         }
 
         // get accounts:
@@ -619,7 +619,7 @@ class OperatorQuerySearch implements SearchInterface
             $stringMethod = 'str_contains';
         }
         if (StringPosition::IS === $stringPosition) {
-            $stringMethod = 'stringIsEqual';
+            $stringMethod = 'string_is_equal';
         }
 
         // search for accounts:

app/Support/Twig/General.php

@@ -317,14 +317,14 @@ class General extends AbstractExtension
         return new TwigFilter(
             'mimeIcon',
             static fn (string $string): string => match ($string) {
-                'application/pdf'                                          => 'fa-file-pdf-o',
+                'application/pdf'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           => 'fa-file-pdf-o',
                 'image/webp',
                 'image/png',
                 'image/jpeg',
                 'image/svg+xml',
                 'image/heic',
                 'image/heic-sequence',
-                'application/vnd.oasis.opendocument.image'                 => 'fa-file-image-o',
+                'application/vnd.oasis.opendocument.image'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  => 'fa-file-image-o',
                 'application/msword',
                 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
                 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
@@ -337,7 +337,7 @@ class General extends AbstractExtension
                 'application/vnd.oasis.opendocument.text',
                 'application/vnd.oasis.opendocument.text-template',
                 'application/vnd.oasis.opendocument.text-web',
-                'application/vnd.oasis.opendocument.text-master'           => 'fa-file-word-o',
+                'application/vnd.oasis.opendocument.text-master'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            => 'fa-file-word-o',
                 'application/vnd.ms-excel',
                 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
                 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
@@ -345,7 +345,7 @@ class General extends AbstractExtension
                 'application/vnd.sun.xml.calc.template',
                 'application/vnd.stardivision.calc',
                 'application/vnd.oasis.opendocument.spreadsheet',
-                'application/vnd.oasis.opendocument.spreadsheet-template'  => 'fa-file-excel-o',
+                'application/vnd.oasis.opendocument.spreadsheet-template'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   => 'fa-file-excel-o',
                 'application/vnd.ms-powerpoint',
                 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
                 'application/vnd.openxmlformats-officedocument.presentationml.template',
@@ -354,18 +354,18 @@ class General extends AbstractExtension
                 'application/vnd.sun.xml.impress.template',
                 'application/vnd.stardivision.impress',
                 'application/vnd.oasis.opendocument.presentation',
-                'application/vnd.oasis.opendocument.presentation-template' => 'fa-file-powerpoint-o',
+                'application/vnd.oasis.opendocument.presentation-template'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  => 'fa-file-powerpoint-o',
                 'application/vnd.sun.xml.draw',
                 'application/vnd.sun.xml.draw.template',
                 'application/vnd.stardivision.draw',
-                'application/vnd.oasis.opendocument.chart'                 => 'fa-paint-brush',
+                'application/vnd.oasis.opendocument.chart'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  => 'fa-paint-brush',
                 'application/vnd.oasis.opendocument.graphics',
                 'application/vnd.oasis.opendocument.graphics-template',
                 'application/vnd.sun.xml.math',
                 'application/vnd.stardivision.math',
                 'application/vnd.oasis.opendocument.formula',
-                'application/vnd.oasis.opendocument.database'              => 'fa-calculator',
-                default                                                    => 'fa-file-o'
+                'application/vnd.oasis.opendocument.database'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               => 'fa-calculator',
+                default                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     => 'fa-file-o'
             },
             ['is_safe' => ['html']]
         );

app/TransactionRules/Engine/SearchRuleEngine.php

@@ -25,6 +25,9 @@ declare(strict_types=1);
 namespace FireflyIII\TransactionRules\Engine;
 
 use Carbon\Carbon;
+use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
+use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventObjects;
+use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Rule;
@@ -399,9 +402,17 @@ class SearchRuleEngine implements RuleEngineInterface
     private function fireNonStrictRule(Rule $rule): bool
     {
         Log::debug(sprintf('SearchRuleEngine::fireNonStrictRule(%d)!', $rule->id));
-        $collection = $this->findNonStrictRule($rule);
+        $flags               = new TransactionGroupEventFlags();
+        $flags->applyRules   = false;
+        $flags->fireWebhooks = false;
+        $objects             = new TransactionGroupEventObjects();
+        $collection          = $this->findNonStrictRule($rule);
+        $objects->collectFromCollection($collection);
 
         $this->processResults($rule, $collection);
+        // collect from collection, again!
+        $objects->collectFromCollection($collection);
+        event(new UpdatedSingleTransactionGroup($flags, $objects));
         Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
 
         return $collection->count() > 0;
@@ -438,11 +449,23 @@ class SearchRuleEngine implements RuleEngineInterface
     private function fireStrictRule(Rule $rule): bool
     {
         Log::debug(sprintf('SearchRuleEngine::fireStrictRule(%d)!', $rule->id));
-        $collection = $this->findStrictRule($rule);
 
+        $flags               = new TransactionGroupEventFlags();
+        $flags->applyRules   = false;
+        $flags->fireWebhooks = false;
+        $objects             = new TransactionGroupEventObjects();
+        $collection          = $this->findStrictRule($rule);
+
+        $objects->collectFromCollection($collection);
         $this->processResults($rule, $collection);
 
-        $result     = $collection->count() > 0;
+        // collect from collection, again!
+        $objects->collectFromCollection($collection);
+
+        // fire event for changed groups.
+        event(new UpdatedSingleTransactionGroup($flags, $objects));
+
+        $result              = $collection->count() > 0;
         if ($result) {
             Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
 

bootstrap/app.php

@@ -63,29 +63,7 @@ use PragmaRX\Google2FALaravel\Middleware as MFAMiddleware;
 
 bcscale(12);
 
-if (!function_exists('envDefaultWhenEmpty')) {
-    /**
-     *
-     * @return mixed|null
-     */
-    function envDefaultWhenEmpty(mixed $value, string | int | bool | null $default = null): mixed
-    {
-        if(null === $value) {
-            return $default;
-        }
-        if('' === $value) {
-            return $default;
-        }
-        return $value;
-    }
-}
 
-if (!function_exists('stringIsEqual')) {
-    function stringIsEqual(string $left, string $right): bool
-    {
-        return $left === $right;
-    }
-}
 
 $app = Application::configure(basePath: dirname(__DIR__))
                   ->withRouting(

composer.json

@@ -135,6 +135,9 @@
 
     "suggest": {},
     "autoload": {
+        "files": [
+            "app/Helpers/Functions/helpers.php"
+        ],
         "psr-4": {
             "FireflyIII\\": "app/",
             "Domain\\": "domain/",

composer.lock

@@ -1879,16 +1879,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v13.5.0",
+            "version": "v13.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ffa1850049a691b93129808f27ecd10e65c9d1a5"
+                "reference": "416a93ea9c53161e0d4b8a44045f447b65a7d2f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ffa1850049a691b93129808f27ecd10e65c9d1a5",
-                "reference": "ffa1850049a691b93129808f27ecd10e65c9d1a5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/416a93ea9c53161e0d4b8a44045f447b65a7d2f1",
+                "reference": "416a93ea9c53161e0d4b8a44045f447b65a7d2f1",
                 "shasum": ""
             },
             "require": {
@@ -2098,20 +2098,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-04-14T13:55:03+00:00"
+            "time": "2026-04-21T13:32:11+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v13.7.4",
+            "version": "v13.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "16c45794c6a6176792fdf555f986aa1b944d9081"
+                "reference": "90053dc4ba681c076855779250109bb624f961f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/16c45794c6a6176792fdf555f986aa1b944d9081",
-                "reference": "16c45794c6a6176792fdf555f986aa1b944d9081",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/90053dc4ba681c076855779250109bb624f961f6",
+                "reference": "90053dc4ba681c076855779250109bb624f961f6",
                 "shasum": ""
             },
             "require": {
@@ -2173,20 +2173,20 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2026-04-09T13:39:45+00:00"
+            "time": "2026-04-16T14:00:29+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.16",
+            "version": "v0.3.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "11e7d5f93803a2190b00e145142cb00a33d17ad2"
+                "reference": "6a82ac19a28b916ae0885828795dbd4c59d9a818"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/11e7d5f93803a2190b00e145142cb00a33d17ad2",
-                "reference": "11e7d5f93803a2190b00e145142cb00a33d17ad2",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/6a82ac19a28b916ae0885828795dbd4c59d9a818",
+                "reference": "6a82ac19a28b916ae0885828795dbd4c59d9a818",
                 "shasum": ""
             },
             "require": {
@@ -2230,9 +2230,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.16"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.17"
             },
-            "time": "2026-03-23T14:35:33+00:00"
+            "time": "2026-04-20T16:07:33+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -3938,23 +3938,23 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.9.3",
+            "version": "v8.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "b0d8ab95b29c3189aeeb902d81215231df4c1b64"
+                "reference": "716af8f95a470e9094cfca09ed897b023be191a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b0d8ab95b29c3189aeeb902d81215231df4c1b64",
-                "reference": "b0d8ab95b29c3189aeeb902d81215231df4c1b64",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/716af8f95a470e9094cfca09ed897b023be191a5",
+                "reference": "716af8f95a470e9094cfca09ed897b023be191a5",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.18.4",
                 "nunomaduro/termwind": "^2.4.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.4.8 || ^8.0.4"
+                "symfony/console": "^7.4.8 || ^8.0.8"
             },
             "conflict": {
                 "laravel/framework": "<11.48.0 || >=14.0.0",
@@ -3962,12 +3962,12 @@
             },
             "require-dev": {
                 "brianium/paratest": "^7.8.5",
-                "larastan/larastan": "^3.9.3",
-                "laravel/framework": "^11.48.0 || ^12.56.0 || ^13.2.0",
-                "laravel/pint": "^1.29.0",
-                "orchestra/testbench-core": "^9.12.0 || ^10.12.1 || ^11.0.0",
+                "larastan/larastan": "^3.9.6",
+                "laravel/framework": "^11.48.0 || ^12.56.0 || ^13.5.0",
+                "laravel/pint": "^1.29.1",
+                "orchestra/testbench-core": "^9.12.0 || ^10.12.1 || ^11.2.1",
                 "pestphp/pest": "^3.8.5 || ^4.4.3 || ^5.0.0",
-                "sebastian/environment": "^7.2.1 || ^8.0.4 || ^9.0.0"
+                "sebastian/environment": "^7.2.1 || ^8.0.4 || ^9.3.0"
             },
             "type": "library",
             "extra": {
@@ -4030,7 +4030,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2026-04-06T19:25:53+00:00"
+            "time": "2026-04-21T14:04:20+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -10473,16 +10473,16 @@
         },
         {
             "name": "fruitcake/laravel-debugbar",
-            "version": "v4.2.6",
+            "version": "v4.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fruitcake/laravel-debugbar.git",
-                "reference": "68c3de788feb7047bea547b51253e71a54e7936a"
+                "reference": "799d70c1101d3f8840dd76ff68ff6a78f9352905"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/68c3de788feb7047bea547b51253e71a54e7936a",
-                "reference": "68c3de788feb7047bea547b51253e71a54e7936a",
+                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/799d70c1101d3f8840dd76ff68ff6a78f9352905",
+                "reference": "799d70c1101d3f8840dd76ff68ff6a78f9352905",
                 "shasum": ""
             },
             "require": {
@@ -10559,7 +10559,7 @@
             ],
             "support": {
                 "issues": "https://github.com/fruitcake/laravel-debugbar/issues",
-                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.2.6"
+                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.2.8"
             },
             "funding": [
                 {
@@ -10571,7 +10571,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-10T07:24:18+00:00"
+            "time": "2026-04-20T13:31:29+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -11141,16 +11141,16 @@
         },
         {
             "name": "php-debugbar/php-debugbar",
-            "version": "v3.7.4",
+            "version": "v3.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "af82a54530c56919ce3c6fba1942a247ac9f6777"
+                "reference": "dbf77f48fa6e6b57ed57ae67aa047b2535697788"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/af82a54530c56919ce3c6fba1942a247ac9f6777",
-                "reference": "af82a54530c56919ce3c6fba1942a247ac9f6777",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/dbf77f48fa6e6b57ed57ae67aa047b2535697788",
+                "reference": "dbf77f48fa6e6b57ed57ae67aa047b2535697788",
                 "shasum": ""
             },
             "require": {
@@ -11227,7 +11227,7 @@
             ],
             "support": {
                 "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.7.4"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v3.7.5"
             },
             "funding": [
                 {
@@ -11239,7 +11239,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-09T11:28:41+00:00"
+            "time": "2026-04-15T11:58:43+00:00"
         },
         {
             "name": "php-debugbar/symfony-bridge",
@@ -11357,11 +11357,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.50",
+            "version": "2.1.51",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d452086fb4cf648c6b2d8cf3b639351f79e4f3e2",
-                "reference": "d452086fb4cf648c6b2d8cf3b639351f79e4f3e2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc3b523c45e714c70de2ac5113b958223b55dc59",
+                "reference": "dc3b523c45e714c70de2ac5113b958223b55dc59",
                 "shasum": ""
             },
             "require": {
@@ -11406,7 +11406,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-17T13:10:32+00:00"
+            "time": "2026-04-21T18:22:01+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -11511,21 +11511,22 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "14.1.3",
+            "version": "14.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "24dc6fcf9f2a983de5b3f1199fb01e88d68e7474"
+                "reference": "4991e47adce8e31e554aee8fdaabfc3b1d60707d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/24dc6fcf9f2a983de5b3f1199fb01e88d68e7474",
-                "reference": "24dc6fcf9f2a983de5b3f1199fb01e88d68e7474",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4991e47adce8e31e554aee8fdaabfc3b1d60707d",
+                "reference": "4991e47adce8e31e554aee8fdaabfc3b1d60707d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
+                "ext-mbstring": "*",
                 "ext-xmlwriter": "*",
                 "nikic/php-parser": "^5.7.0",
                 "php": ">=8.4",
@@ -11576,7 +11577,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.3"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.1.6"
             },
             "funding": [
                 {
@@ -11596,7 +11597,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-18T05:41:54+00:00"
+            "time": "2026-04-24T13:10:08+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",

config/app.php

@@ -36,12 +36,12 @@ use Illuminate\Support\Facades\URL;
 use Spatie\Html\Facades\Html;
 
 return [
-    'name'            => envDefaultWhenEmpty(env('APP_NAME'), 'Firefly III'),
-    'env'             => envDefaultWhenEmpty(env('APP_ENV'), 'production'),
+    'name'            => env_default_when_empty(env('APP_NAME'), 'Firefly III'),
+    'env'             => env_default_when_empty(env('APP_ENV'), 'production'),
     'debug'           => env('APP_DEBUG', false),
-    'url'             => envDefaultWhenEmpty(env('APP_URL'), 'http://localhost'),
-    'timezone'        => envDefaultWhenEmpty(env('TZ'), 'UTC'),
-    'locale'          => envDefaultWhenEmpty(env('DEFAULT_LANGUAGE'), 'en_US'),
+    'url'             => env_default_when_empty(env('APP_URL'), 'http://localhost'),
+    'timezone'        => env_default_when_empty(env('TZ'), 'UTC'),
+    'locale'          => env_default_when_empty(env('DEFAULT_LANGUAGE'), 'en_US'),
     'fallback_locale' => 'en_US',
     'key'             => env('APP_KEY'),
     'cipher'          => 'AES-256-CBC',

config/auth.php

@@ -37,10 +37,10 @@ return [
     */
 
     'defaults'         => [
-        'guard'     => envDefaultWhenEmpty(env('AUTHENTICATION_GUARD'), 'web'),
+        'guard'     => env_default_when_empty(env('AUTHENTICATION_GUARD'), 'web'),
         'passwords' => 'users',
     ],
-    'guard_header'     => envDefaultWhenEmpty(env('AUTHENTICATION_GUARD_HEADER'), 'REMOTE_USER'),
+    'guard_header'     => env_default_when_empty(env('AUTHENTICATION_GUARD_HEADER'), 'REMOTE_USER'),
     'guard_email'      => env('AUTHENTICATION_GUARD_EMAIL'),
 
     /*

config/cache.php

@@ -36,7 +36,7 @@ return [
     |
     */
 
-    'default' => envDefaultWhenEmpty(env('CACHE_DRIVER'), 'file'),
+    'default' => env_default_when_empty(env('CACHE_DRIVER'), 'file'),
 
     /*
     |--------------------------------------------------------------------------

config/database.php

@@ -49,7 +49,7 @@ $mysql_ssl_ciphers = env('MYSQL_SSL_CIPHER');
 $mysql_ssl_verify  = env('MYSQL_SSL_VERIFY_SERVER_CERT');
 
 $mySqlSSLOptions   = [];
-$useSSL            = envDefaultWhenEmpty(env('MYSQL_USE_SSL'), false);
+$useSSL            = env_default_when_empty(env('MYSQL_USE_SSL'), false);
 if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) {
     if (null !== $mysql_ssl_ca_dir) {
         $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;
@@ -72,19 +72,19 @@ if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) {
 }
 
 return [
-    'default'     => envDefaultWhenEmpty(env('DB_CONNECTION'), 'mysql'),
+    'default'     => env_default_when_empty(env('DB_CONNECTION'), 'mysql'),
     'connections' => [
         'sqlite' => [
             'driver'   => 'sqlite',
-            'database' => envDefaultWhenEmpty(env('DB_DATABASE'), storage_path('database/database.sqlite')),
+            'database' => env_default_when_empty(env('DB_DATABASE'), storage_path('database/database.sqlite')),
             'prefix'   => '',
         ],
         'mysql'  => [
             'driver'      => 'mysql',
-            'host'        => envDefaultWhenEmpty(env('DB_HOST'), $host),
-            'port'        => envDefaultWhenEmpty(env('DB_PORT'), $port),
-            'database'    => envDefaultWhenEmpty(env('DB_DATABASE'), $database),
-            'username'    => envDefaultWhenEmpty(env('DB_USERNAME'), $username),
+            'host'        => env_default_when_empty(env('DB_HOST'), $host),
+            'port'        => env_default_when_empty(env('DB_PORT'), $port),
+            'database'    => env_default_when_empty(env('DB_DATABASE'), $database),
+            'username'    => env_default_when_empty(env('DB_USERNAME'), $username),
             'password'    => env('DB_PASSWORD', $password),
             'unix_socket' => env('DB_SOCKET', ''),
             'charset'     => 'utf8mb4',
@@ -96,16 +96,16 @@ return [
         ],
         'pgsql'  => [
             'driver'      => 'pgsql',
-            'host'        => envDefaultWhenEmpty(env('DB_HOST'), $host),
-            'port'        => envDefaultWhenEmpty(env('DB_PORT'), $port),
-            'database'    => envDefaultWhenEmpty(env('DB_DATABASE'), $database),
-            'username'    => envDefaultWhenEmpty(env('DB_USERNAME'), $username),
+            'host'        => env_default_when_empty(env('DB_HOST'), $host),
+            'port'        => env_default_when_empty(env('DB_PORT'), $port),
+            'database'    => env_default_when_empty(env('DB_DATABASE'), $database),
+            'username'    => env_default_when_empty(env('DB_USERNAME'), $username),
             'password'    => env('DB_PASSWORD', $password),
             'charset'     => 'utf8',
             'prefix'      => '',
-            'search_path' => envDefaultWhenEmpty(env('PGSQL_SCHEMA'), 'public'),
-            'schema'      => envDefaultWhenEmpty(env('PGSQL_SCHEMA'), 'public'),
-            'sslmode'     => envDefaultWhenEmpty(env('PGSQL_SSL_MODE'), 'prefer'),
+            'search_path' => env_default_when_empty(env('PGSQL_SCHEMA'), 'public'),
+            'schema'      => env_default_when_empty(env('PGSQL_SCHEMA'), 'public'),
+            'sslmode'     => env_default_when_empty(env('PGSQL_SSL_MODE'), 'prefer'),
             'sslcert'     => env('PGSQL_SSL_CERT'),
             'sslkey'      => env('PGSQL_SSL_KEY'),
             'sslrootcert' => env('PGSQL_SSL_ROOT_CERT'),
@@ -139,21 +139,21 @@ return [
             // 'prefix'  => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
         ],
         'default' => [
-            'scheme'   => envDefaultWhenEmpty(env('REDIS_SCHEME'), 'tcp'),
+            'scheme'   => env_default_when_empty(env('REDIS_SCHEME'), 'tcp'),
             'url'      => env('REDIS_URL'),
             'path'     => env('REDIS_PATH'),
-            'host'     => envDefaultWhenEmpty(env('REDIS_HOST'), '127.0.0.1'),
-            'port'     => envDefaultWhenEmpty(env('REDIS_PORT'), 6379),
+            'host'     => env_default_when_empty(env('REDIS_HOST'), '127.0.0.1'),
+            'port'     => env_default_when_empty(env('REDIS_PORT'), 6379),
             'username' => env('REDIS_USERNAME'),
             'password' => env('REDIS_PASSWORD'),
             'database' => env('REDIS_DB', '0'),
         ],
         'cache'   => [
-            'scheme'   => envDefaultWhenEmpty(env('REDIS_SCHEME'), 'tcp'),
+            'scheme'   => env_default_when_empty(env('REDIS_SCHEME'), 'tcp'),
             'url'      => env('REDIS_URL'),
             'path'     => env('REDIS_PATH'),
-            'host'     => envDefaultWhenEmpty(env('REDIS_HOST'), '127.0.0.1'),
-            'port'     => envDefaultWhenEmpty(env('REDIS_PORT'), 6379),
+            'host'     => env_default_when_empty(env('REDIS_HOST'), '127.0.0.1'),
+            'port'     => env_default_when_empty(env('REDIS_PORT'), 6379),
             'username' => env('REDIS_USERNAME'),
             'password' => env('REDIS_PASSWORD'),
             'database' => env('REDIS_CACHE_DB', '1'),

config/firefly.php

@@ -75,18 +75,18 @@ return [
         'webhooks'               => true,
         'handle_debts'           => true,
         'expression_engine'      => true,
-        'running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
+        'running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-'version' => 'develop/2026-04-20',
-'build_time' => 1776658280,
+'version' => 'develop/2026-04-25',
+'build_time' => 1777088715,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 
     // Docker build info, if present:
     'is_docker'                            => env('IS_DOCKER', false),
-    'base_image_build'                     => envDefaultWhenEmpty(env('BASE_IMAGE_BUILD'), '(unknown)'),
-    'base_image_date'                      => envDefaultWhenEmpty(env('BASE_IMAGE_DATE'), '(unknown)'),
+    'base_image_build'                     => env_default_when_empty(env('BASE_IMAGE_BUILD'), '(unknown)'),
+    'base_image_date'                      => env_default_when_empty(env('BASE_IMAGE_DATE'), '(unknown)'),
     'is_local_dev'                         => env('IS_LOCAL_DEV', false),
 
     // generic settings
@@ -112,8 +112,8 @@ return [
     'tracker_url'                          => env('TRACKER_URL', ''),
 
     // authentication settings
-    'authentication_guard'                 => envDefaultWhenEmpty(env('AUTHENTICATION_GUARD'), 'web'),
-    'custom_logout_url'                    => envDefaultWhenEmpty(env('CUSTOM_LOGOUT_URL'), ''),
+    'authentication_guard'                 => env_default_when_empty(env('AUTHENTICATION_GUARD'), 'web'),
+    'custom_logout_url'                    => env_default_when_empty(env('CUSTOM_LOGOUT_URL'), ''),
 
     // static config (cannot be changed by user)
     'update_endpoint'                      => 'https://version.firefly-iii.org/index.json',
@@ -194,8 +194,8 @@ return [
         'convertToPrimary'   => false,
     ],
     'default_currency'                     => 'EUR',
-    'default_language'                     => envDefaultWhenEmpty(env('DEFAULT_LANGUAGE'), 'en_US'),
-    'default_locale'                       => envDefaultWhenEmpty(env('DEFAULT_LOCALE'), 'equal'),
+    'default_language'                     => env_default_when_empty(env('DEFAULT_LANGUAGE'), 'en_US'),
+    'default_locale'                       => env_default_when_empty(env('DEFAULT_LOCALE'), 'equal'),
 
     // account types that may have or set a currency
     'valid_currency_account_types'         => [
@@ -224,7 +224,7 @@ return [
     'available_dark_modes'                 => ['light', 'dark', 'browser'],
     'bill_reminder_periods'                => [90, 30, 14, 7, 0],
     'valid_view_ranges'                    => ['1D', '1W', '1M', '3M', '6M', '1Y'],
-    'valid_url_protocols'                  => envDefaultWhenEmpty(env('VALID_URL_PROTOCOLS'), 'http,https,ftp,ftps,mailto'), // no longer used, only for default.
+    'valid_url_protocols'                  => env_default_when_empty(env('VALID_URL_PROTOCOLS'), 'http,https,ftp,ftps,mailto'), // no longer used, only for default.
     'allowedMimes'                         => [
         // plain files
         'text/plain',

config/logging.php

@@ -34,7 +34,7 @@ $validChannels      = ['single', 'papertrail', 'stdout', 'daily', 'syslog', 'err
 $validAuditChannels = ['audit_papertrail', 'audit_stdout', 'audit_stdout', 'audit_daily', 'audit_syslog', 'audit_errorlog'];
 
 // which settings did the user set, if any?
-$defaultLogChannel  = (string) envDefaultWhenEmpty(env('LOG_CHANNEL'), 'stack');
+$defaultLogChannel  = (string) env_default_when_empty(env('LOG_CHANNEL'), 'stack');
 $auditLogChannel    = (string) env('AUDIT_LOG_CHANNEL');
 
 if ('stack' === $defaultLogChannel) {
@@ -60,8 +60,8 @@ return [
     |
     */
 
-    'default'  => envDefaultWhenEmpty(env('LOG_CHANNEL'), 'stack'),
-    'level'    => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+    'default'  => env_default_when_empty(env('LOG_CHANNEL'), 'stack'),
+    'level'    => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
     /*
     |--------------------------------------------------------------------------
     | Log Channels
@@ -93,11 +93,11 @@ return [
         'single'           => [
             'driver' => 'single',
             'path'   => storage_path('logs/laravel.log'),
-            'level'  => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
         ],
         'papertrail'       => [
             'driver'       => 'monolog',
-            'level'        => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'        => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
             'handler'      => SyslogUdpHandler::class,
             'handler_with' => [
                 'host' => env('PAPERTRAIL_HOST'),
@@ -107,21 +107,21 @@ return [
         'stdout'           => [
             'driver' => 'single',
             'path'   => 'php://stdout',
-            'level'  => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
         ],
         'daily'            => [
             'driver' => 'daily',
             'path'   => storage_path('logs/ff3-'.PHP_SAPI.'.log'),
-            'level'  => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
             'days'   => 7,
         ],
         'syslog'           => [
             'driver' => 'syslog',
-            'level'  => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
         ],
         'errorlog'         => [
             'driver' => 'errorlog',
-            'level'  => envDefaultWhenEmpty(env('APP_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('APP_LOG_LEVEL'), 'info'),
         ],
 
         /*
@@ -130,7 +130,7 @@ return [
          */
         'audit_papertrail' => [
             'driver'       => 'monolog',
-            'level'        => envDefaultWhenEmpty(env('AUDIT_LOG_LEVEL'), 'info'),
+            'level'        => env_default_when_empty(env('AUDIT_LOG_LEVEL'), 'info'),
             'handler'      => SyslogUdpHandler::class,
             'tap'          => [AuditLogger::class],
             'handler_with' => [
@@ -142,24 +142,24 @@ return [
             'driver' => 'single',
             'path'   => 'php://stdout',
             'tap'    => [AuditLogger::class],
-            'level'  => envDefaultWhenEmpty(env('AUDIT_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('AUDIT_LOG_LEVEL'), 'info'),
         ],
         'audit_daily'      => [
             'driver' => 'daily',
             'path'   => storage_path('logs/ff3-audit.log'),
             'tap'    => [AuditLogger::class],
-            'level'  => envDefaultWhenEmpty(env('AUDIT_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('AUDIT_LOG_LEVEL'), 'info'),
             'days'   => 90,
         ],
         'audit_syslog'     => [
             'driver' => 'syslog',
             'tap'    => [AuditLogger::class],
-            'level'  => envDefaultWhenEmpty(env('AUDIT_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('AUDIT_LOG_LEVEL'), 'info'),
         ],
         'audit_errorlog'   => [
             'driver' => 'errorlog',
             'tap'    => [AuditLogger::class],
-            'level'  => envDefaultWhenEmpty(env('AUDIT_LOG_LEVEL'), 'info'),
+            'level'  => env_default_when_empty(env('AUDIT_LOG_LEVEL'), 'info'),
         ],
     ],
 ];

config/mail.php

@@ -34,16 +34,16 @@ return [
     | and used as needed; however, this mailer will be used by default.
     |
     */
-    'default'  => envDefaultWhenEmpty(env('MAIL_MAILER'), 'log'),
+    'default'  => env_default_when_empty(env('MAIL_MAILER'), 'log'),
 
     'mailers'  => [
         'smtp'       => [
             'transport'         => 'smtp',
-            'host'              => envDefaultWhenEmpty(env('MAIL_HOST'), 'smtp.mailtrap.io'),
+            'host'              => env_default_when_empty(env('MAIL_HOST'), 'smtp.mailtrap.io'),
             'port'              => (int) env('MAIL_PORT', 2525),
-            'encryption'        => envDefaultWhenEmpty(env('MAIL_ENCRYPTION'), 'tls'),
-            'username'          => envDefaultWhenEmpty(env('MAIL_USERNAME'), 'user@example.com'),
-            'password'          => envDefaultWhenEmpty(env('MAIL_PASSWORD'), 'password'),
+            'encryption'        => env_default_when_empty(env('MAIL_ENCRYPTION'), 'tls'),
+            'username'          => env_default_when_empty(env('MAIL_USERNAME'), 'user@example.com'),
+            'password'          => env_default_when_empty(env('MAIL_PASSWORD'), 'password'),
             'timeout'           => null,
             'scheme'            => env('MAIL_SCHEME'),
             'url'               => env('MAIL_URL'),
@@ -73,7 +73,7 @@ return [
 
         'sendmail'   => [
             'transport' => 'sendmail',
-            'path'      => envDefaultWhenEmpty(env('MAIL_SENDMAIL_COMMAND'), '/usr/sbin/sendmail -bs'),
+            'path'      => env_default_when_empty(env('MAIL_SENDMAIL_COMMAND'), '/usr/sbin/sendmail -bs'),
         ],
         'log'        => [
             'transport' => 'log',
@@ -91,7 +91,7 @@ return [
         ],
     ],
 
-    'from'     => ['address' => envDefaultWhenEmpty(env('MAIL_FROM'), 'changeme@example.com'), 'name' => 'Firefly III Mailer'],
+    'from'     => ['address' => env_default_when_empty(env('MAIL_FROM'), 'changeme@example.com'), 'name' => 'Firefly III Mailer'],
     'markdown' => [
         'theme' => 'default',
 

config/passport.php

@@ -1,40 +1,21 @@
 <?php
 
-/*
- * passport.php
- * Copyright (c) 2023 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/>.
- */
-
 declare(strict_types=1);
 
 return [
-    /*
-    |--------------------------------------------------------------------------
-    | Passport Guard
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify which authentication guard Passport will use when
-    | authenticating users. This value should correspond with one of your
-    | guards that is already present in your "auth" configuration file.
-    |
-    */
 
-    'guard'                  => envDefaultWhenEmpty(env('AUTHENTICATION_GUARD'), 'web'),
+    /*
+|--------------------------------------------------------------------------
+| Passport Guard
+|--------------------------------------------------------------------------
+|
+| Here you may specify which authentication guard Passport will use when
+| authenticating users. This value should correspond with one of your
+| guards that is already present in your "auth" configuration file.
+|
+*/
+
+    'guard'                  => env_default_when_empty(env('AUTHENTICATION_GUARD'), 'web'),
 
     /*
     |--------------------------------------------------------------------------
@@ -51,32 +32,12 @@ return [
 
     'public_key'             => env('PASSPORT_PUBLIC_KEY'),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Client UUIDs
-    |--------------------------------------------------------------------------
-    |
-    | By default, Passport uses auto-incrementing primary keys when assigning
-    | IDs to clients. However, if Passport is installed using the provided
-    | --uuids switch, this will be set to "true" and UUIDs will be used.
-    |
-    */
-
-    'client_uuids'           => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Personal Access Client
-    |--------------------------------------------------------------------------
-    |
-    | If you enable client hashing, you should set the personal access client
-    | ID and unhashed secret within your environment file. The values will
-    | get used while issuing fresh personal access tokens to your users.
-    |
-    */
-
     'personal_access_client' => [
         'id'     => env('PASSPORT_PERSONAL_ACCESS_CLIENT_ID'),
         'secret' => env('PASSPORT_PERSONAL_ACCESS_CLIENT_SECRET'),
     ],
+
+    'middleware'             => [],
+    'connection'             => env('PASSPORT_CONNECTION'),
+
 ];

package-lock.json

@@ -2900,57 +2900,57 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.32",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.32.tgz",
-            "integrity": "sha512-4x74Tbtqnda8s/NSD6e1Dr5p1c8HdMU5RWSjMSUzb8RTcUQqevDCxVAitcLBKT+ie3o0Dl9crc/S/opJM7qBGQ==",
+            "version": "3.5.33",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.33.tgz",
+            "integrity": "sha512-3PZLQwFw4Za3TC8t0FvTy3wI16Kt+pmwcgNZca4Pj9iWL2E72a/gZlpBtAJvEdDMdCxdG/qq0C7PN0bsJuv0Rw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/parser": "^7.29.2",
-                "@vue/shared": "3.5.32",
+                "@vue/shared": "3.5.33",
                 "entities": "^7.0.1",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.32",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.32.tgz",
-            "integrity": "sha512-ybHAu70NtiEI1fvAUz3oXZqkUYEe5J98GjMDpTGl5iHb0T15wQYLR4wE3h9xfuTNA+Cm2f4czfe8B4s+CCH57Q==",
+            "version": "3.5.33",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.33.tgz",
+            "integrity": "sha512-PXq0yrfCLzzL07rbXO4awtXY1Z06LG2eu6Adg3RJFa/j3Cii217XxxLXG22N330gw7GmALCY0Z8RgXEviwgpjA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": "3.5.32",
-                "@vue/shared": "3.5.32"
+                "@vue/compiler-core": "3.5.33",
+                "@vue/shared": "3.5.33"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.32",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.32.tgz",
-            "integrity": "sha512-8UYUYo71cP/0YHMO814TRZlPuUUw3oifHuMR7Wp9SNoRSrxRQnhMLNlCeaODNn6kNTJsjFoQ/kqIj4qGvya4Xg==",
+            "version": "3.5.33",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.33.tgz",
+            "integrity": "sha512-UTUvRO9cY+rROrx/pvN9P5Z7FgA6QGfokUCfhQE4EnmUj3rVnK+CHI0LsEO1pg+I7//iRYMUfcNcCPe7tg0CoA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/parser": "^7.29.2",
-                "@vue/compiler-core": "3.5.32",
-                "@vue/compiler-dom": "3.5.32",
-                "@vue/compiler-ssr": "3.5.32",
-                "@vue/shared": "3.5.32",
+                "@vue/compiler-core": "3.5.33",
+                "@vue/compiler-dom": "3.5.33",
+                "@vue/compiler-ssr": "3.5.33",
+                "@vue/shared": "3.5.33",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.21",
-                "postcss": "^8.5.8",
+                "postcss": "^8.5.10",
                 "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.32",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.32.tgz",
-            "integrity": "sha512-Gp4gTs22T3DgRotZ8aA/6m2jMR+GMztvBXUBEUOYOcST+giyGWJ4WvFd7QLHBkzTxkfOt8IELKNdpzITLbA2rw==",
+            "version": "3.5.33",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.33.tgz",
+            "integrity": "sha512-IErjYdnj1qIupG5xxiVIYiiRvDhGWV4zuh/RCrwfYpuL+HWQzeU6lCk/nF9r7olWMnjKxCAkOctT2qFWFkzb1A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.32",
-                "@vue/shared": "3.5.32"
+                "@vue/compiler-dom": "3.5.33",
+                "@vue/shared": "3.5.33"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3032,9 +3032,9 @@
             "license": "MIT"
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.32",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
-            "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
+            "version": "3.5.33",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.33.tgz",
+            "integrity": "sha512-5vR2QIlmaLG77Ygd4pMP6+SGQ5yox9VhtnbDWTy9DzMzdmeLxZ1QqxrywEZ9sa1AVubfIJyaCG3ytyWU81ufcQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -3315,9 +3315,9 @@
             "license": "MIT"
         },
         "node_modules/ajv": {
-            "version": "6.14.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-            "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
+            "version": "6.15.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
+            "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3350,9 +3350,9 @@
             }
         },
         "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "version": "8.20.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+            "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3569,9 +3569,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.15.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.1.tgz",
-            "integrity": "sha512-WOG+Jj8ZOvR0a3rAn+Tuf1UQJRxw5venr6DgdbJzngJE3qG7X0kL83CZGpdHMxEm+ZK3seAbvFsw4FfOfP9vxg==",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
+            "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3681,9 +3681,9 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.10.20",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz",
-            "integrity": "sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==",
+            "version": "2.10.21",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
+            "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -3738,9 +3738,9 @@
             "license": "MIT"
         },
         "node_modules/body-parser": {
-            "version": "1.20.4",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
-            "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
+            "version": "1.20.5",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz",
+            "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3752,7 +3752,7 @@
                 "http-errors": "~2.0.1",
                 "iconv-lite": "~0.4.24",
                 "on-finished": "~2.4.1",
-                "qs": "~6.14.0",
+                "qs": "~6.15.1",
                 "raw-body": "~2.5.3",
                 "type-is": "~1.6.18",
                 "unpipe": "~1.0.0"
@@ -3779,22 +3779,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/body-parser/node_modules/qs": {
-            "version": "6.14.2",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
-            "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "side-channel": "^1.1.0"
-            },
-            "engines": {
-                "node": ">=0.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/bonjour-service": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
@@ -4133,9 +4117,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001788",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz",
-            "integrity": "sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==",
+            "version": "1.0.30001790",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
+            "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
             "dev": true,
             "funding": [
                 {
@@ -5337,9 +5321,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.340",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.340.tgz",
-            "integrity": "sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==",
+            "version": "1.5.344",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz",
+            "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==",
             "dev": true,
             "license": "ISC"
         },
@@ -5394,14 +5378,14 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.20.1",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
-            "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
+            "version": "5.21.0",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz",
+            "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.4",
-                "tapable": "^2.3.0"
+                "tapable": "^2.3.3"
             },
             "engines": {
                 "node": ">=10.13.0"
@@ -6646,9 +6630,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "26.0.6",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.6.tgz",
-            "integrity": "sha512-A4U6eCXodIbrhf8EarRurB9/4ebyaurH4+fu4gig9bqxmpSt+fCAFm/GpRQDcN1Xzu/LdFCx4nYHsnM1edIIbg==",
+            "version": "26.0.8",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.8.tgz",
+            "integrity": "sha512-BRzLom0mhDhV9v0QhgUUHWQJuwFmnr1194xEcNLYD6ym8y8s542n4jXUvRLnhNTbh9PmpU6kGZamyuGHQMsGjw==",
             "funding": [
                 {
                     "type": "individual",
@@ -6664,9 +6648,6 @@
                 }
             ],
             "license": "MIT",
-            "dependencies": {
-                "@babel/runtime": "^7.29.2"
-            },
             "peerDependencies": {
                 "typescript": "^5 || ^6"
             },
@@ -6686,9 +6667,9 @@
             }
         },
         "node_modules/i18next-http-backend": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.5.tgz",
-            "integrity": "sha512-QaWHnsxieEDcqKe+vo/RFqpiIFRi/KBqlOSPcUlvinBaISCeiTRCbtrazHAjtHtsLC66oDsROAH8frWkQzfMMQ==",
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.6.tgz",
+            "integrity": "sha512-mBOqy8993jtqAoj6XaI1XeC/8/9v6EPS+681ziegrPvTB0DoaCY7PpTS0SpY56qLMoS4OI1TZEM2Zf59zNh05w==",
             "license": "MIT",
             "dependencies": {
                 "cross-fetch": "4.1.0"
@@ -7212,9 +7193,9 @@
             }
         },
         "node_modules/jsonfile": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-            "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
+            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
             "license": "MIT",
             "dependencies": {
                 "universalify": "^2.0.0"
@@ -7712,9 +7693,9 @@
             "license": "MIT"
         },
         "node_modules/loader-runner": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.1.tgz",
-            "integrity": "sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz",
+            "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -8269,9 +8250,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.37",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
-            "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
+            "version": "2.0.38",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
+            "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
             "dev": true,
             "license": "MIT"
         },
@@ -10748,9 +10729,9 @@
             }
         },
         "node_modules/tapable": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.2.tgz",
-            "integrity": "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==",
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
+            "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -10762,9 +10743,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.46.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.1.tgz",
-            "integrity": "sha512-vzCjQO/rgUuK9sf8VJZvjqiqiHFaZLnOiimmUuOKODxWL8mm/xua7viT7aqX7dgPY60otQjUotzFMmCB4VdmqQ==",
+            "version": "5.46.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
+            "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -10781,9 +10762,9 @@
             }
         },
         "node_modules/terser-webpack-plugin": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz",
-            "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==",
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz",
+            "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10815,9 +10796,9 @@
             }
         },
         "node_modules/terser-webpack-plugin/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "version": "8.20.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+            "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11689,9 +11670,9 @@
             }
         },
         "node_modules/webpack-dev-middleware/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "version": "8.20.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+            "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11806,9 +11787,9 @@
             }
         },
         "node_modules/webpack-dev-server/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "version": "8.20.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+            "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11926,9 +11907,9 @@
             }
         },
         "node_modules/webpack/node_modules/ajv": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-            "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "version": "8.20.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+            "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11983,9 +11964,9 @@
             }
         },
         "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.4.tgz",
-            "integrity": "sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==",
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.0.tgz",
+            "integrity": "sha512-gHwIe1cgBvvfLeu1Yz/dcFpmHfKDVxxyqI+kzqmuxZED81z2ChxpyqPaWcNqigPywhaEke7AjSGga+kxY55gjQ==",
             "dev": true,
             "license": "MIT",
             "engines": {

public/v1/js/.gitignore

@@ -1,3 +1,3 @@
 *.LICENSE.txt
 *.js
-#webhooks
+!ff/*/*.js

public/v1/js/ff/auth/.htaccess

@@ -0,0 +1 @@
+Options -Indexes

public/v1/js/ff/auth/register.js

@@ -0,0 +1,98 @@
+/*
+ * register.js
+ * Copyright (c) 2026 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/>.
+ */
+
+(function () {
+    const form        = document.querySelector('form[action="'+route+'"]');
+    const errorBox    = document.getElementById('client-errors');
+    const errorList   = document.getElementById('client-errors-list');
+    const submitBtn   = form.querySelector('button[type="submit"]');
+    const originalBtnText = submitBtn.textContent;
+
+    function showErrors(errors) {
+        errorList.innerHTML = errors.map(function(e) { return '<li>' + e + '</li>'; }).join('');
+        errorBox.style.display = 'block';
+        errorBox.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+    }
+
+    async function sha1Hex(str) {
+        const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(str));
+        return Array.from(new Uint8Array(buf))
+            .map(function(b) { return b.toString(16).padStart(2, '0'); })
+            .join('')
+            .toUpperCase();
+    }
+
+    async function isPwned(password) {
+        const hash   = await sha1Hex(password);
+        const prefix = hash.slice(0, 5);
+        const suffix = hash.slice(5);
+        const res    = await fetch('https://api.pwnedpasswords.com/range/' + prefix, {
+            headers: { 'Add-Padding': 'true' }
+        });
+        if (!res.ok) { return false; }
+        const text = await res.text();
+        return text.toUpperCase().split('\n').some(function(line) {
+            return line.split(':')[0] === suffix;
+        });
+    }
+
+    form.addEventListener('submit', async function (e) {
+        e.preventDefault();
+        errorBox.style.display = 'none';
+
+        const password = form.querySelector('[name="password"]').value;
+        const confirm  = form.querySelector('[name="password_confirmation"]').value;
+        const verify   = form.querySelector('[name="verify_password"]');
+        const errors   = [];
+
+        if (password.length < 16) {
+            errors.push(passwordLengthError);
+        }
+        if (password !== confirm) {
+            errors.push(passwordMatchError);
+        }
+
+        if (errors.length > 0) {
+            showErrors(errors);
+            return;
+        }
+
+        if (verify && verify.checked) {
+            submitBtn.disabled    = true;
+            submitBtn.textContent = waitForVerify;
+            try {
+                if (await isPwned(password)) {
+                    errors.push(needSecurePassword);
+                }
+            } catch (_) {
+                // network failure — let server validate
+            }
+            submitBtn.disabled    = false;
+            submitBtn.textContent = originalBtnText;
+        }
+
+        if (errors.length > 0) {
+            showErrors(errors);
+            return;
+        }
+
+        form.submit();
+    });
+})();

resources/assets/v1/mix-manifest.json

@@ -36,6 +36,7 @@
     "/public/v1/js/ff/accounts/show.js": "/public/v1/js/ff/accounts/show.js",
     "/public/v1/js/ff/admin/update/index.js": "/public/v1/js/ff/admin/update/index.js",
     "/public/v1/js/ff/admin/users.js": "/public/v1/js/ff/admin/users.js",
+    "/public/v1/js/ff/auth/register.js": "/public/v1/js/ff/auth/register.js",
     "/public/v1/js/ff/bills/create.js": "/public/v1/js/ff/bills/create.js",
     "/public/v1/js/ff/bills/edit.js": "/public/v1/js/ff/bills/edit.js",
     "/public/v1/js/ff/bills/index.js": "/public/v1/js/ff/bills/index.js",

resources/assets/v1/src/locales/sl.json

@@ -1,8 +1,8 @@
 {
     "firefly": {
-        "explain_pats": "Personal Access Tokens are long lived (with a maximum of 1 year) keys that allow direct and unlimited access to your Firefly III data. Tools like the Firefly III Data Importer and the Firefly III integration in Home Assistant use such tokens to connect to Firefly III and do their thing. When you create a token, it is only visible once. The token is also very long.",
-        "profile_oauth_clients_explain": "An OAuth client can be used to connect \"smart\" applications to Firefly III: applications that are capable of redirecting you to your Firefly III, get your permission, and return you back. The Firefly III Data Importer is such an application. OAuth clients can be generated with or without a \"secret\". This secret is used to authenticate the client. Since not all clients are capable of storing the secret, so you have the option to generate a client without one.",
-        "regenerate_secret": "Regenerate secret",
+        "explain_pats": "Osebni \u017eetoni za dostop so dolgo\u017eivi (najve\u010d 1 leto) klju\u010di, ki omogo\u010dajo neposreden in neomejen dostop do va\u0161ih podatkov Firefly III. Orodja kot sta Uvoz podatkov Firefly III in integracija Firefly III v Home Assistant uporabljajo tak\u0161ne \u017eetone za povezavo s Firefly III. Ko ustvarite \u017eeton, je viden samo enkrat. \u017deton je tudi zelo dolg.",
+        "profile_oauth_clients_explain": "OAuth odjemalec se lahko uporabi za povezavo \u00bbpametnih\u00ab aplikacij s Firefly III: aplikacij, ki vas znajo preusmeriti na va\u0161 Firefly III, pridobiti va\u0161e dovoljenje in vas vrniti nazaj. Uvoz podatkov Firefly III je ena tak\u0161nih aplikacij. OAuth odjemalce je mogo\u010de ustvariti z \u00bbskrivnostjo\u00ab ali brez nje. Ta skrivnost se uporablja za avtentikacijo odjemalca. Ker niso vsi odjemalci zmo\u017eni shraniti skrivnosti, imate mo\u017enost ustvariti odjemalca brez nje.",
+        "regenerate_secret": "Obnovi skrivnost",
         "administrations_page_title": "Finan\u010dne administracije",
         "administrations_index_menu": "Finan\u010dne administracije",
         "expires_at": "Pote\u010de ob",
@@ -75,8 +75,8 @@
         "profile_whoops": "Ups!",
         "profile_something_wrong": "Nekaj je \u0161lo narobe!",
         "profile_try_again": "Nekaj \u200b\u200bje \u0161lo narobe. Prosim poskusite znova.",
-        "profile_oauth_clients": "OAuth Clients and Applications",
-        "profile_oauth_no_clients": "You have not created any OAuth clients or applications.",
+        "profile_oauth_clients": "OAuth odjemalci in aplikacije",
+        "profile_oauth_no_clients": "Niste ustvarili \u0161e nobenega odjemalca OAuth ali aplikacije.",
         "profile_oauth_clients_header": "Odjemalci",
         "profile_oauth_client_id": "Client ID",
         "profile_oauth_client_name": "Ime",
@@ -86,7 +86,7 @@
         "profile_oauth_edit_client": "Urejanje odjemalca",
         "profile_oauth_name_help": "Nekaj, kar bodo va\u0161i uporabniki prepoznali in mu zaupali.",
         "profile_oauth_redirect_url": "URL preusmeritve",
-        "profile_oauth_clients_external_auth": "Please note that if you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
+        "profile_oauth_clients_external_auth": "Upo\u0161tevajte, da odjemalci OAuth ne bodo delovali, \u010de uporabljate zunanjega ponudnika avtentikacije kot je Authelia. Uporabite lahko samo osebne \u017eetone za dostop.",
         "profile_oauth_redirect_url_help": "URL povratnega klica avtorizacije va\u0161e aplikacije.",
         "profile_authorized_apps": "Poobla\u0161\u010dene aplikacije",
         "profile_authorized_clients": "Poobla\u0161\u010deni odjemalci",
@@ -104,8 +104,8 @@
         "piggy_bank": "Dodaj hranilnik",
         "profile_oauth_client_secret_title": "Skrivna koda odjemalca",
         "profile_oauth_client_secret_expl": "Tukaj je skrivna koda va\u0161ega odjemalca. To je edini \u010das, da bo prikazana, zato je ne izgubite! Zdaj lahko uporabite to skrivno kodo za po\u0161iljanje zahtev API.",
-        "profile_oauth_confidential": "Keep a secret?",
-        "profile_oauth_confidential_help": "Can the application you're using this for keep a secret? The Firefly III Data Importer CANNOT keep a secret, so UNCHECK the box. In other cases, it's up to you.",
+        "profile_oauth_confidential": "Obdr\u017ei skrivnost?",
+        "profile_oauth_confidential_help": "Ali lahko aplikacija, za katero jo uporabljate, ohrani skrivnost? Uvoz podatkov Firefly III NE MORE ohraniti skrivnosti, zato ODKLJUKAJTE polje. V ostalih primerih je odlo\u010ditev va\u0161a.",
         "multi_account_warning_unknown": "Odvisno od vrste transakcije, ki jo ustvarite, lahko izvorni in\/ali ciljni ra\u010dun poznej\u0161ih razdelitev preglasi tisto, kar je definirano v prvi razdelitvi transakcije.",
         "multi_account_warning_withdrawal": "Upo\u0161tevajte, da bo izvorni ra\u010dun poznej\u0161ih razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi odliva.",
         "multi_account_warning_deposit": "Upo\u0161tevajte, da bo ciljni ra\u010dun poznej\u0161ih delitev preglasilo tisto, kar je opredeljeno v prvi delitvi priliva.",

resources/lang/en_US/validation.php

@@ -23,6 +23,7 @@
 declare(strict_types=1);
 
 return [
+    'verifying_password'              => 'Verifying password...',
     'invalid_account_list'            => 'Invalid account type list entry ":value"',
     'invalid_transaction_type_list'   => 'Invalid transaction type list',
     'limit_exists'                    => 'There is already a budget limit (amount) for this budget and currency in the given period.',

resources/views/auth/register.blade.php

@@ -21,6 +21,10 @@
         </div>
     @endif
 
+    <div id="client-errors" class="alert alert-danger" role="alert" style="display:none;">
+        <ul id="client-errors-list"></ul>
+    </div>
+
     <div class="card">
         <div class="card-body register-card-body">
             <p class="login-box-msg">{{ trans('firefly.register_new_account') }}</p>
@@ -35,11 +39,11 @@
                 </div>
                 <div class="input-group mb-3">
                     <input type="password" autocomplete="new-password" required class="form-control"
-                           placeholder="{{ trans('form.password') }}" name="password"/>
+                           placeholder="{{ trans('form.password') }}" minlength="16" name="password"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
                 <div class="input-group mb-3">
-                    <input type="password" autocomplete="new-password" required class="form-control"
+                    <input type="password" autocomplete="new-password" minlength="16" required class="form-control"
                            placeholder="{{ trans('form.password_confirmation') }}" name="password_confirmation"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
@@ -76,5 +80,12 @@
 
 @endsection
 @section('scripts')
-    @vite(['src/pages/dashboard/dashboard.js'])
+    <script nonce="{{ $JS_NONCE }}">
+        var route = '{{ route('register') }}';
+        var passwordLengthError = '{{ blade_escape_js((string)trans('validation.min.string', ['attribute' => 'password', 'min' => 16])) }}';
+        var passwordMatchError = '{{ blade_escape_js(trans('validation.confirmed', ['attribute' => 'password'])) }}';
+        var waitForVerify = '{{ blade_escape_js(trans('validation.verifying_password')) }}';
+        var needSecurePassword = '{{ blade_escape_js(trans('validation.secure_password')) }}';
+        </script>
+    <script nonce="{{$JS_NONCE}}" src="v1/js/ff/auth/register.js"></script>
 @endsection

resources/views/list/groups.twig

@@ -32,9 +32,9 @@
     <tr>
         <th class="hidden-xs">&nbsp;</th>
         <th>{{ trans('list.description') }}</th>
-        <th>{{ trans('list.amount') }}</th>
+        <th class="text-right">{{ trans('list.amount') }}</th>
         {% if fireflyiiiconfig('use_running_balance', true) %}
-        <th>{{ trans('list.running_balance') }}</th>
+        <th class="text-right">{{ trans('list.running_balance') }}</th>
         {% endif %}
         <th>{{ trans('list.date') }}</th>
         <th>{{ trans('list.source_account') }}</th>
@@ -282,8 +282,15 @@
                             {% if transaction.source_account_id == account.id %}
                                 <span title="Deposit, source">{{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             {% else %}
+                                {% if transaction.source_account_type == 'Revenue account' %}
+                                    <span title="Deposit from revenue">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                {% else %}
+                                    <span title="Deposit from liab">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
+                                {% endif %}
+                                {# if this is a deposit from revenue account, use the destination account currency? For #12043 and #12169 #}
+                                {# otherwise, keep at source account #}
                                 {# changed from normal currency_symbol to foreign_currency_symbol for #12043 #}
-                                <span title="Deposit, dest">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
+
                             {%  endif %}
 
                         {% elseif transaction.transaction_type_type == 'Withdrawal' %}

routes/web.php

@@ -32,8 +32,9 @@ if (!defined('DATEFORMAT')) {
 // new Passport routes.
 Route::group(
     [
-        'as'        => 'passport.',
-        'prefix'    => 'oauth',
+        'as'         => 'passport.',
+        'prefix'     => 'oauth',
+        'middleware' => ['user-full-auth'],
         // 'namespace' => 'FireflyIII\Http\Controllers\OAuth',
     ],
     function (): void {