Merge pull request #10942 from firefly-iii/release-1758460508

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-09-21
2025-12-01 02:21:45 +00:00 · 2025-09-21 15:15:17 +02:00 · 2025-09-21 15:15:08 +02:00 · 2025-09-21 15:11:16 +02:00 · 2025-09-21 15:06:32 +02:00 · 2025-09-21 08:58:42 +02:00
28 changed files with 570 additions and 476 deletions
--- a/app/Console/Commands/Correction/CorrectsAccountTypes.php
+++ b/app/Console/Commands/Correction/CorrectsAccountTypes.php
@@ -29,12 +29,15 @@ use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\AccountFactory;
+use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Facades\Log;

 class CorrectsAccountTypes extends Command
 {
@@ -45,6 +48,7 @@ class CorrectsAccountTypes extends Command
    private int            $count;
    private array          $expected;
    private AccountFactory $factory;
+    private AccountRepositoryInterface $repository;

    /**
     * Execute the console command.
@@ -110,7 +114,7 @@ class CorrectsAccountTypes extends Command
        if ($resultSet->count() > 0) {
            $this->friendlyLine(sprintf('Found %d journals that need to be fixed.', $resultSet->count()));
            foreach ($resultSet as $entry) {
-                app('log')->debug(sprintf('Now fixing journal #%d', $entry->id));
+                Log::debug(sprintf('Now fixing journal #%d', $entry->id));

                /** @var null|TransactionJournal $journal */
                $journal = TransactionJournal::find($entry->id);
@@ -120,7 +124,7 @@ class CorrectsAccountTypes extends Command
            }
        }
        if (0 !== $this->count) {
-            app('log')->debug(sprintf('%d journals had to be fixed.', $this->count));
+            Log::debug(sprintf('%d journals had to be fixed.', $this->count));
            $this->friendlyInfo(sprintf('Acted on %d transaction(s)', $this->count));
        }

@@ -134,10 +138,10 @@ class CorrectsAccountTypes extends Command

    private function inspectJournal(TransactionJournal $journal): void
    {
-        app('log')->debug(sprintf('Now inspecting journal #%d', $journal->id));
+        Log::debug(sprintf('Now inspecting journal #%d', $journal->id));
        $transactions      = $journal->transactions()->count();
        if (2 !== $transactions) {
-            app('log')->debug(sprintf('Journal has %d transactions, so can\'t fix.', $transactions));
+            Log::debug(sprintf('Journal has %d transactions, so can\'t fix.', $transactions));
            $this->friendlyError(sprintf('Cannot inspect transaction journal #%d because it has %d transaction(s) instead of 2.', $journal->id, $transactions));

            return;
@@ -151,20 +155,20 @@ class CorrectsAccountTypes extends Command
        $destAccountType   = $destAccount->accountType->type;

        if (!array_key_exists($type, $this->expected)) {
-            app('log')->info(sprintf('No source/destination info for transaction type %s.', $type));
+            Log::info(sprintf('No source/destination info for transaction type %s.', $type));
            $this->friendlyError(sprintf('No source/destination info for transaction type %s.', $type));

            return;
        }
        if (!array_key_exists($sourceAccountType, $this->expected[$type])) {
-            app('log')->debug(sprintf('[a] Going to fix journal #%d', $journal->id));
+            Log::debug(sprintf('[a] Going to fix journal #%d', $journal->id));
            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);

            return;
        }
        $expectedTypes     = $this->expected[$type][$sourceAccountType];
        if (!in_array($destAccountType, $expectedTypes, true)) {
-            app('log')->debug(sprintf('[b] Going to fix journal #%d', $journal->id));
+            Log::debug(sprintf('[b] Going to fix journal #%d', $journal->id));
            $this->fixJournal($journal, $type, $sourceTransaction, $destTransaction);
        }
    }
@@ -181,13 +185,15 @@ class CorrectsAccountTypes extends Command

    private function fixJournal(TransactionJournal $journal, string $transactionType, Transaction $source, Transaction $dest): void
    {
-        app('log')->debug(sprintf('Going to fix journal #%d', $journal->id));
+        Log::debug(sprintf('Going to fix journal #%d', $journal->id));
+        $this->repository       = app(AccountRepositoryInterface::class);
+        $this->repository->setUser($journal->user);
        ++$this->count;
        // variables:
-        $sourceType           = $source->account->accountType->type;
-        $destinationType      = $dest->account->accountType->type;
-        $combination          = sprintf('%s%s%s', $transactionType, $source->account->accountType->type, $dest->account->accountType->type);
-        app('log')->debug(sprintf('Combination is "%s"', $combination));
+        $sourceType             = $source->account->accountType->type;
+        $destinationType        = $dest->account->accountType->type;
+        $combination            = sprintf('%s%s%s', $transactionType, $source->account->accountType->type, $dest->account->accountType->type);
+        Log::debug(sprintf('Combination is "%s"', $combination));

        if ($this->shouldBeTransfer($transactionType, $sourceType, $destinationType)) {
            $this->makeTransfer($journal);
@@ -211,37 +217,45 @@ class CorrectsAccountTypes extends Command
        }

        // transaction has no valid source.
-        $validSources         = array_keys($this->expected[$transactionType]);
-        $canCreateSource      = $this->canCreateSource($validSources);
-        $hasValidSource       = $this->hasValidAccountType($validSources, $sourceType);
+        $validSources           = array_keys($this->expected[$transactionType]);
+        $canCreateSource        = $this->canCreateSource($validSources);
+        $hasValidSource         = $this->hasValidAccountType($validSources, $sourceType);
        if (!$hasValidSource && $canCreateSource) {
            $this->giveNewRevenue($journal, $source);

            return;
        }
        if (!$canCreateSource && !$hasValidSource) {
-            app('log')->debug('This transaction type has no source we can create. Just give error.');
+            Log::debug('This transaction type has no source we can create. Just give error.');
            $message = sprintf('The source account of %s #%d cannot be of type "%s". Firefly III cannot fix this. You may have to remove the transaction yourself.', $transactionType, $journal->id, $source->account->accountType->type);
            $this->friendlyError($message);
-            app('log')->debug($message);
+            Log::debug($message);

            return;
        }

        /** @var array $validDestinations */
-        $validDestinations    = $this->expected[$transactionType][$sourceType] ?? [];
-        $canCreateDestination = $this->canCreateDestination($validDestinations);
-        $hasValidDestination  = $this->hasValidAccountType($validDestinations, $destinationType);
+        $validDestinations      = $this->expected[$transactionType][$sourceType] ?? [];
+        $canCreateDestination   = $this->canCreateDestination($validDestinations);
+        $hasValidDestination    = $this->hasValidAccountType($validDestinations, $destinationType);
+        $alternativeDestination = $this->repository->findByName($dest->account->name, $validDestinations);
        if (!$hasValidDestination && $canCreateDestination) {
            $this->giveNewExpense($journal, $dest);

            return;
        }
-        if (!$canCreateDestination && !$hasValidDestination) {
-            app('log')->debug('This transaction type has no destination we can create. Just give error.');
+        if (!$canCreateDestination && !$hasValidDestination && null === $alternativeDestination) {
+            Log::debug('This transaction type has no destination we can create. Just give error.');
            $message = sprintf('The destination account of %s #%d cannot be of type "%s". Firefly III cannot fix this. You may have to remove the transaction yourself.', $transactionType, $journal->id, $dest->account->accountType->type);
            $this->friendlyError($message);
-            app('log')->debug($message);
+            Log::debug($message);
+        }
+        if (!$canCreateDestination && !$hasValidDestination && null !== $alternativeDestination) {
+            Log::debug('This transaction type has no destination we can create, but found alternative with the same name.');
+            $message = sprintf('The destination account of %s #%d cannot be of type "%s". Firefly III found an alternative account. Please make sure this transaction is correct.', $transactionType, $journal->transaction_group_id, $dest->account->accountType->type);
+            $this->friendlyInfo($message);
+            Log::debug($message);
+            $this->giveNewDestinationAccount($journal, $alternativeDestination);
        }
    }

@@ -263,7 +277,7 @@ class CorrectsAccountTypes extends Command
        $journal->save();
        $message    = sprintf('Converted transaction #%d from a transfer to a withdrawal.', $journal->id);
        $this->friendlyInfo($message);
-        app('log')->debug($message);
+        Log::debug($message);
        // check it again:
        $this->inspectJournal($journal);
    }
@@ -281,7 +295,7 @@ class CorrectsAccountTypes extends Command
        $journal->save();
        $message = sprintf('Converted transaction #%d from a transfer to a deposit.', $journal->id);
        $this->friendlyInfo($message);
-        app('log')->debug($message);
+        Log::debug($message);
        // check it again:
        $this->inspectJournal($journal);
    }
@@ -308,7 +322,7 @@ class CorrectsAccountTypes extends Command
            $result->name
        );
        $this->friendlyWarning($message);
-        app('log')->debug($message);
+        Log::debug($message);
        $this->inspectJournal($journal);
    }

@@ -335,7 +349,7 @@ class CorrectsAccountTypes extends Command
            $result->name
        );
        $this->friendlyWarning($message);
-        app('log')->debug($message);
+        Log::debug($message);
        $this->inspectJournal($journal);
    }

@@ -354,14 +368,14 @@ class CorrectsAccountTypes extends Command

    private function giveNewRevenue(TransactionJournal $journal, Transaction $source): void
    {
-        app('log')->debug(sprintf('An account of type "%s" could be a valid source.', AccountTypeEnum::REVENUE->value));
+        Log::debug(sprintf('An account of type "%s" could be a valid source.', AccountTypeEnum::REVENUE->value));
        $this->factory->setUser($journal->user);
        $name      = $source->account->name;
        $newSource = $this->factory->findOrCreate($name, AccountTypeEnum::REVENUE->value);
        $source->account()->associate($newSource);
        $source->save();
        $this->friendlyPositive(sprintf('Firefly III gave transaction #%d a new source %s: #%d ("%s").', $journal->transaction_group_id, AccountTypeEnum::REVENUE->value, $newSource->id, $newSource->name));
-        app('log')->debug(sprintf('Associated account #%d with transaction #%d', $newSource->id, $source->id));
+        Log::debug(sprintf('Associated account #%d with transaction #%d', $newSource->id, $source->id));
        $this->inspectJournal($journal);
    }

@@ -372,14 +386,33 @@ class CorrectsAccountTypes extends Command

    private function giveNewExpense(TransactionJournal $journal, Transaction $destination): void
    {
-        app('log')->debug(sprintf('An account of type "%s" could be a valid destination.', AccountTypeEnum::EXPENSE->value));
+        Log::debug(sprintf('An account of type "%s" could be a valid destination.', AccountTypeEnum::EXPENSE->value));
        $this->factory->setUser($journal->user);
        $name           = $destination->account->name;
        $newDestination = $this->factory->findOrCreate($name, AccountTypeEnum::EXPENSE->value);
        $destination->account()->associate($newDestination);
        $destination->save();
        $this->friendlyPositive(sprintf('Firefly III gave transaction #%d a new destination %s: #%d ("%s").', $journal->transaction_group_id, AccountTypeEnum::EXPENSE->value, $newDestination->id, $newDestination->name));
-        app('log')->debug(sprintf('Associated account #%d with transaction #%d', $newDestination->id, $destination->id));
+        Log::debug(sprintf('Associated account #%d with transaction #%d', $newDestination->id, $destination->id));
        $this->inspectJournal($journal);
    }
+
+    private function giveNewDestinationAccount(TransactionJournal $journal, Account $newDestination): void
+    {
+        $destTransaction             = $this->getDestinationTransaction($journal);
+        $oldDest                     = $destTransaction->account;
+        $destTransaction->account_id = $newDestination->id;
+        $destTransaction->save();
+        $message                     = sprintf(
+            'Transaction journal #%d, destination account changed from #%d ("%s") to #%d ("%s").',
+            $journal->id,
+            $oldDest->id,
+            $oldDest->name,
+            $newDestination->id,
+            $newDestination->name
+        );
+        $this->friendlyInfo($message);
+        $journal->refresh();
+        Log::debug($message);
+    }
 }
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@@ -222,7 +222,7 @@ class TransactionJournalFactory
        Log::debug('Source info:', $sourceInfo);
        Log::debug('Destination info:', $destInfo);
        $sourceAccount         = $this->getAccount($type->type, 'source', $sourceInfo);
-        $destinationAccount    = $this->getAccount($type->type, 'destination', $destInfo);
+        $destinationAccount    = $this->getAccount($type->type, 'destination', $destInfo, $sourceAccount);
        Log::debug('Done with getAccount(2x)');


--- a/app/Models/CurrencyExchangeRate.php
+++ b/app/Models/CurrencyExchangeRate.php
@@ -38,7 +38,7 @@ class CurrencyExchangeRate extends Model
    use ReturnsIntegerUserIdTrait;
    use SoftDeletes;

-    protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'date_tz', 'rate'];
+    protected $fillable = ['user_id', 'user_group_id', 'from_currency_id', 'to_currency_id', 'date', 'date_tz', 'rate'];

    public function fromCurrency(): BelongsTo
    {
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -45,6 +45,7 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Override;

@@ -150,18 +151,18 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
            $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
            $query->whereIn('account_types.type', $types);
        }
-        app('log')->debug(sprintf('Searching for account named "%s" (of user #%d) of the following type(s)', $name, $this->user->id), ['types' => $types]);
+        Log::debug(sprintf('Searching for account named "%s" (of user #%d) of the following type(s)', $name, $this->user->id), ['types' => $types]);

        $query->where('accounts.name', $name);

        /** @var null|Account $account */
        $account = $query->first(['accounts.*']);
        if (null === $account) {
-            app('log')->debug(sprintf('There is no account with name "%s" of types', $name), $types);
+            Log::debug(sprintf('There is no account with name "%s" of types', $name), $types);

            return null;
        }
-        app('log')->debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id));
+        Log::debug(sprintf('Found #%d (%s) with type id %d', $account->id, $account->name, $account->account_type_id));

        return $account;
    }
@@ -465,14 +466,14 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
        ];
        if (array_key_exists(ucfirst($type), $sets)) {
            $order = (int) $this->getAccountsByType($sets[ucfirst($type)])->max('order');
-            app('log')->debug(sprintf('Return max order of "%s" set: %d', $type, $order));
+            Log::debug(sprintf('Return max order of "%s" set: %d', $type, $order));

            return $order;
        }
        $specials = [AccountTypeEnum::CASH->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::RECONCILIATION->value];

        $order    = (int) $this->getAccountsByType($specials)->max('order');
-        app('log')->debug(sprintf('Return max order of "%s" set (specials!): %d', $type, $order));
+        Log::debug(sprintf('Return max order of "%s" set (specials!): %d', $type, $order));

        return $order;
    }
@@ -599,7 +600,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
                    continue;
                }
                if ($index !== (int) $account->order) {
-                    app('log')->debug(sprintf('Account #%d ("%s"): order should %d be but is %d.', $account->id, $account->name, $index, $account->order));
+                    Log::debug(sprintf('Account #%d ("%s"): order should %d be but is %d.', $account->id, $account->name, $index, $account->order));
                    $account->order = $index;
                    $account->save();
                }
--- a/app/Services/Internal/Support/JournalServiceTrait.php
+++ b/app/Services/Internal/Support/JournalServiceTrait.php
@@ -54,7 +54,7 @@ trait JournalServiceTrait
    /**
     * @throws FireflyException
     */
-    protected function getAccount(string $transactionType, string $direction, array $data): ?Account
+    protected function getAccount(string $transactionType, string $direction, array $data, ?Account $opposite = null): ?Account
    {
        // some debug logging:
        Log::debug(sprintf('Now in getAccount(%s)', $direction), $data);
@@ -69,12 +69,12 @@ trait JournalServiceTrait
        $message       = 'Transaction = %s, %s account should be in: %s. Direction is %s.';
        Log::debug(sprintf($message, $transactionType, $direction, implode(', ', $expectedTypes[$transactionType] ?? ['UNKNOWN']), $direction));

-        $result        = $this->findAccountById($data, $expectedTypes[$transactionType]);
-        $result        = $this->findAccountByIban($result, $data, $expectedTypes[$transactionType]);
+        $result        = $this->findAccountById($data, $expectedTypes[$transactionType], $opposite);
+        $result        = $this->findAccountByIban($result, $data, $expectedTypes[$transactionType], $opposite);
        $ibanResult    = $result;
-        $result        = $this->findAccountByNumber($result, $data, $expectedTypes[$transactionType]);
+        $result        = $this->findAccountByNumber($result, $data, $expectedTypes[$transactionType], $opposite);
        $numberResult  = $result;
-        $result        = $this->findAccountByName($result, $data, $expectedTypes[$transactionType]);
+        $result        = $this->findAccountByName($result, $data, $expectedTypes[$transactionType], $opposite);
        $nameResult    = $result;

        // if $result (find by name) is NULL, but IBAN is set, any result of the search by NAME can't overrule
@@ -82,7 +82,7 @@ trait JournalServiceTrait
        if (null !== $nameResult && null === $numberResult && null === $ibanResult && '' !== (string) $data['iban'] && '' !== (string) $nameResult->iban) {
            $data['name'] = sprintf('%s (%s)', $data['name'], $data['iban']);
            Log::debug(sprintf('Search again using the new name, "%s".', $data['name']));
-            $result       = $this->findAccountByName(null, $data, $expectedTypes[$transactionType]);
+            $result       = $this->findAccountByName(null, $data, $expectedTypes[$transactionType], $opposite);
        }

        // the account that Firefly III creates must be "creatable", aka select the one we can create from the list just in case
@@ -115,15 +115,19 @@ trait JournalServiceTrait
        return $result;
    }

-    private function findAccountById(array $data, array $types): ?Account
+    private function findAccountById(array $data, array $types, ?Account $opposite = null): ?Account
    {
        // first attempt, find by ID.
        if (null !== $data['id']) {
            $search = $this->accountRepository->find((int) $data['id']);
            if (null !== $search && in_array($search->accountType->type, $types, true)) {
-                Log::debug(
-                    sprintf('Found "account_id" object: #%d, "%s" of type %s (1)', $search->id, $search->name, $search->accountType->type)
-                );
+                Log::debug(sprintf('Found "account_id" object: #%d, "%s" of type %s (1)', $search->id, $search->name, $search->accountType->type));
+
+                if ($opposite?->id === $search->id) {
+                    Log::debug(sprintf('Account #%d is the same as opposite account #%d, returning NULL.', $search->id, $opposite->id));
+
+                    return null;
+                }

                return $search;
            }
@@ -140,7 +144,7 @@ trait JournalServiceTrait
        return null;
    }

-    private function findAccountByIban(?Account $account, array $data, array $types): ?Account
+    private function findAccountByIban(?Account $account, array $data, array $types, ?Account $opposite = null): ?Account
    {
        if ($account instanceof Account) {
            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
@@ -153,21 +157,27 @@ trait JournalServiceTrait
            return null;
        }
        // find by preferred type.
-        $source = $this->accountRepository->findByIbanNull($data['iban'], [$types[0]]);
+        $result = $this->accountRepository->findByIbanNull($data['iban'], [$types[0]]);
        // or any expected type.
-        $source ??= $this->accountRepository->findByIbanNull($data['iban'], $types);
+        $result ??= $this->accountRepository->findByIbanNull($data['iban'], $types);

-        if (null !== $source) {
-            Log::debug(sprintf('Found "account_iban" object: #%d, %s', $source->id, $source->name));
+        if (null !== $result) {
+            Log::debug(sprintf('Found "account_iban" object: #%d, %s', $result->id, $result->name));

-            return $source;
+            if ($opposite?->id === $result->id) {
+                Log::debug(sprintf('Account #%d is the same as opposite account #%d, returning NULL.', $result->id, $opposite->id));
+
+                return null;
+            }
+
+            return $result;
        }
        Log::debug(sprintf('Found no account with IBAN "%s" of expected types', $data['iban']), $types);

        return null;
    }

-    private function findAccountByNumber(?Account $account, array $data, array $types): ?Account
+    private function findAccountByNumber(?Account $account, array $data, array $types, ?Account $opposite = null): ?Account
    {
        if ($account instanceof Account) {
            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
@@ -180,15 +190,21 @@ trait JournalServiceTrait
            return null;
        }
        // find by preferred type.
-        $source = $this->accountRepository->findByAccountNumber((string) $data['number'], [$types[0]]);
+        $result = $this->accountRepository->findByAccountNumber((string) $data['number'], [$types[0]]);

        // or any expected type.
-        $source ??= $this->accountRepository->findByAccountNumber((string) $data['number'], $types);
+        $result ??= $this->accountRepository->findByAccountNumber((string) $data['number'], $types);

-        if (null !== $source) {
-            Log::debug(sprintf('Found account: #%d, %s', $source->id, $source->name));
+        if (null !== $result) {
+            Log::debug(sprintf('Found account: #%d, %s', $result->id, $result->name));

-            return $source;
+            if ($opposite?->id === $result->id) {
+                Log::debug(sprintf('Account #%d is the same as opposite account #%d, returning NULL.', $result->id, $opposite->id));
+
+                return null;
+            }
+
+            return $result;
        }

        Log::debug(sprintf('Found no account with account number "%s" of expected types', $data['number']), $types);
@@ -196,7 +212,7 @@ trait JournalServiceTrait
        return null;
    }

-    private function findAccountByName(?Account $account, array $data, array $types): ?Account
+    private function findAccountByName(?Account $account, array $data, array $types, ?Account $opposite = null): ?Account
    {
        if ($account instanceof Account) {
            Log::debug(sprintf('Already have account #%d ("%s"), return that.', $account->id, $account->name));
@@ -210,15 +226,21 @@ trait JournalServiceTrait
        }

        // find by preferred type.
-        $source = $this->accountRepository->findByName($data['name'], [$types[0]]);
+        $result = $this->accountRepository->findByName($data['name'], [$types[0]]);

        // or any expected type.
-        $source ??= $this->accountRepository->findByName($data['name'], $types);
+        $result ??= $this->accountRepository->findByName($data['name'], $types);

-        if (null !== $source) {
-            Log::debug(sprintf('Found "account_name" object: #%d, %s', $source->id, $source->name));
+        if (null !== $result) {
+            Log::debug(sprintf('Found "account_name" object: #%d, %s', $result->id, $result->name));

-            return $source;
+            if ($opposite?->id === $result->id) {
+                Log::debug(sprintf('Account #%d is the same as opposite account #%d, returning NULL.', $result->id, $opposite->id));
+
+                return null;
+            }
+
+            return $result;
        }
        Log::debug(sprintf('Found no account with account name "%s" of expected types', $data['name']), $types);

--- a/app/Support/Cronjobs/AutoBudgetCronjob.php
+++ b/app/Support/Cronjobs/AutoBudgetCronjob.php
@@ -40,8 +40,8 @@ class AutoBudgetCronjob extends AbstractCronjob
        /** @var Configuration $config */
        $config        = FireflyConfig::get('last_ab_job', 0);
        $lastTime      = (int) $config->data;
-        $diff          = Carbon::now()->getTimestamp() - $lastTime;
-        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+        $diff          = now(config('app.timezone'))->getTimestamp() - $lastTime;
+        $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
        if (0 === $lastTime) {
            Log::info('Auto budget cron-job has never fired before.');
        }
--- a/app/Support/Cronjobs/BillWarningCronjob.php
+++ b/app/Support/Cronjobs/BillWarningCronjob.php
@@ -46,8 +46,8 @@ class BillWarningCronjob extends AbstractCronjob
        /** @var Configuration $config */
        $config        = FireflyConfig::get('last_bw_job', 0);
        $lastTime      = (int) $config->data;
-        $diff          = Carbon::now()->getTimestamp() - $lastTime;
-        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+        $diff          = now(config('app.timezone'))->getTimestamp() - $lastTime;
+        $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);

        if (0 === $lastTime) {
            Log::info('The bill notification cron-job has never fired before.');
--- a/app/Support/Cronjobs/ExchangeRatesCronjob.php
+++ b/app/Support/Cronjobs/ExchangeRatesCronjob.php
@@ -40,8 +40,8 @@ class ExchangeRatesCronjob extends AbstractCronjob
        /** @var Configuration $config */
        $config        = FireflyConfig::get('last_cer_job', 0);
        $lastTime      = (int) $config->data;
-        $diff          = Carbon::now()->getTimestamp() - $lastTime;
-        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+        $diff          = now(config('app.timezone'))->getTimestamp() - $lastTime;
+        $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
        if (0 === $lastTime) {
            Log::info('Exchange rates cron-job has never fired before.');
        }
--- a/app/Support/Cronjobs/RecurringCronjob.php
+++ b/app/Support/Cronjobs/RecurringCronjob.php
@@ -46,8 +46,8 @@ class RecurringCronjob extends AbstractCronjob
        /** @var Configuration $config */
        $config        = FireflyConfig::get('last_rt_job', 0);
        $lastTime      = (int) $config->data;
-        $diff          = Carbon::now()->getTimestamp() - $lastTime;
-        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+        $diff          = now(config('app.timezone'))->getTimestamp() - $lastTime;
+        $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);

        if (0 === $lastTime) {
            Log::info('Recurring transactions cron-job has never fired before.');
--- a/app/Support/Cronjobs/WebhookCronjob.php
+++ b/app/Support/Cronjobs/WebhookCronjob.php
@@ -46,8 +46,8 @@ class WebhookCronjob extends AbstractCronjob
        /** @var Configuration $config */
        $config        = FireflyConfig::get('last_webhook_job', 0);
        $lastTime      = (int) $config->data;
-        $diff          = Carbon::now()->getTimestamp() - $lastTime;
-        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+        $diff          = now(config('app.timezone'))->getTimestamp() - $lastTime;
+        $diffForHumans = now(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);

        if (0 === $lastTime) {
            Log::info('The webhook cron-job has never fired before.');
--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
@@ -130,7 +130,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
            }
            $this->amounts[$id][$accountId]['current_amount'] = bcadd($this->amounts[$id][$accountId]['current_amount'], (string) $item->current_amount);
            if (null !== $this->amounts[$id][$accountId]['pc_current_amount'] && null !== $item->native_current_amount) {
-                $this->amounts[$id][$accountId]['pc_current_amount'] = bcadd($this->amounts[$id][$accountId]['pc_current_amount'], $item->native_current_amount);
+                $this->amounts[$id][$accountId]['pc_current_amount'] = bcadd($this->amounts[$id][$accountId]['pc_current_amount'], (string) $item->native_current_amount);
            }
        }

--- a/app/Validation/Account/DepositValidation.php
+++ b/app/Validation/Account/DepositValidation.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Validation\Account;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use Illuminate\Support\Facades\Log;

 /**
 * Trait DepositValidation
@@ -40,7 +41,7 @@ trait DepositValidation
        $accountName = array_key_exists('name', $array) ? $array['name'] : null;
        $accountIban = array_key_exists('iban', $array) ? $array['iban'] : null;

-        app('log')->debug('Now in validateDepositDestination', $array);
+        Log::debug('Now in validateDepositDestination', $array);

        // source can be any of the following types.
        $validTypes  = $this->combinations[$this->transactionType][$this->source->accountType->type] ?? [];
@@ -48,12 +49,12 @@ trait DepositValidation
            // if both values are NULL we return false,
            // because the destination of a deposit can't be created.
            $this->destError = (string) trans('validation.deposit_dest_need_data');
-            app('log')->error('Both values are NULL, cant create deposit destination.');
+            Log::error('Both values are NULL, cant create deposit destination.');
            $result          = false;
        }
        // if the account can be created anyway we don't need to search.
        if (null === $result && true === $this->canCreateTypes($validTypes)) {
-            app('log')->debug('Can create some of these types, so return true.');
+            Log::debug('Can create some of these types, so return true.');
            $result = true;
        }

@@ -61,17 +62,17 @@ trait DepositValidation
            // otherwise try to find the account:
            $search = $this->findExistingAccount($validTypes, $array);
            if (null === $search) {
-                app('log')->debug('findExistingAccount() returned NULL, so the result is false.');
+                Log::debug('findExistingAccount() returned NULL, so the result is false.');
                $this->destError = (string) trans('validation.deposit_dest_bad_data', ['id' => $accountId, 'name' => $accountName]);
                $result          = false;
            }
            if (null !== $search) {
-                app('log')->debug(sprintf('findExistingAccount() returned #%d ("%s"), so the result is true.', $search->id, $search->name));
+                Log::debug(sprintf('findExistingAccount() returned #%d ("%s"), so the result is true.', $search->id, $search->name));
                $this->setDestination($search);
                $result = true;
            }
        }
-        app('log')->debug(sprintf('validateDepositDestination will return %s', var_export($result, true)));
+        Log::debug(sprintf('validateDepositDestination will return %s', var_export($result, true)));

        return $result;
    }
@@ -92,7 +93,7 @@ trait DepositValidation
        $accountName   = array_key_exists('name', $array) ? $array['name'] : null;
        $accountIban   = array_key_exists('iban', $array) ? $array['iban'] : null;
        $accountNumber = array_key_exists('number', $array) ? $array['number'] : null;
-        app('log')->debug('Now in validateDepositSource', $array);
+        Log::debug('Now in validateDepositSource', $array);

        // null = we found nothing at all or didn't even search
        // false = invalid results
@@ -114,7 +115,7 @@ trait DepositValidation

        // if there is an iban, it can only be in use by a valid source type, or we will fail.
        if (null !== $accountIban && '' !== $accountIban) {
-            app('log')->debug('Check if there is not already another account with this IBAN');
+            Log::debug('Check if there is not already another account with this IBAN');
            $existing = $this->findExistingAccount($validTypes, ['iban' => $accountIban], true);
            if (null !== $existing) {
                $this->sourceError = (string) trans('validation.deposit_src_iban_exists');
@@ -128,11 +129,14 @@ trait DepositValidation
        if (null !== $accountId) {
            $search = $this->accountRepository->find($accountId);
            if (null !== $search && !in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug(sprintf('User submitted an ID (#%d), which is a "%s", so this is not a valid source.', $accountId, $search->accountType->type));
-                app('log')->debug(sprintf('Firefly III accepts ID #%d as valid account data.', $accountId));
+                Log::debug(sprintf('User submitted an ID (#%d), which is a "%s", so this is not a valid source.', $accountId, $search->accountType->type));
+                Log::debug(sprintf('Firefly III does not accept ID #%d as valid account data.', $accountId));
+                // #10921 Set result false
+                $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]);
+                $result            = false;
            }
            if (null !== $search && in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug('ID result is not null and seems valid, save as source account.');
+                Log::debug('ID result is not null and seems valid, save as source account.');
                $this->setSource($search);
                $result = true;
            }
@@ -142,11 +146,11 @@ trait DepositValidation
        if (null !== $accountIban) {
            $search = $this->accountRepository->findByIbanNull($accountIban, $validTypes);
            if (null !== $search && !in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug(sprintf('User submitted IBAN ("%s"), which is a "%s", so this is not a valid source.', $accountIban, $search->accountType->type));
+                Log::debug(sprintf('User submitted IBAN ("%s"), which is a "%s", so this is not a valid source.', $accountIban, $search->accountType->type));
                $result = false;
            }
            if (null !== $search && in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug('IBAN result is not null and seems valid, save as source account.');
+                Log::debug('IBAN result is not null and seems valid, save as source account.');
                $this->setSource($search);
                $result = true;
            }
@@ -156,13 +160,13 @@ trait DepositValidation
        if (null !== $accountNumber && '' !== $accountNumber) {
            $search = $this->accountRepository->findByAccountNumber($accountNumber, $validTypes);
            if (null !== $search && !in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug(
+                Log::debug(
                    sprintf('User submitted number ("%s"), which is a "%s", so this is not a valid source.', $accountNumber, $search->accountType->type)
                );
                $result = false;
            }
            if (null !== $search && in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug('Number result is not null and seems valid, save as source account.');
+                Log::debug('Number result is not null and seems valid, save as source account.');
                $this->setSource($search);
                $result = true;
            }
--- a/app/Validation/Account/OBValidation.php
+++ b/app/Validation/Account/OBValidation.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Validation\Account;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use Illuminate\Support\Facades\Log;

 /**
 * Trait OBValidation
@@ -38,7 +39,7 @@ trait OBValidation
        $result      = null;
        $accountId   = array_key_exists('id', $array) ? $array['id'] : null;
        $accountName = array_key_exists('name', $array) ? $array['name'] : null;
-        app('log')->debug('Now in validateOBDestination', $array);
+        Log::debug('Now in validateOBDestination', $array);

        // source can be any of the following types.
        $validTypes  = $this->combinations[$this->transactionType][$this->source?->accountType->type] ?? [];
@@ -46,12 +47,12 @@ trait OBValidation
            // if both values are NULL we return false,
            // because the destination of a deposit can't be created.
            $this->destError = (string) trans('validation.ob_dest_need_data');
-            app('log')->error('Both values are NULL, cant create OB destination.');
+            Log::error('Both values are NULL, cant create OB destination.');
            $result          = false;
        }
        // if the account can be created anyway we don't need to search.
        if (null === $result && true === $this->canCreateTypes($validTypes)) {
-            app('log')->debug('Can create some of these types, so return true.');
+            Log::debug('Can create some of these types, so return true.');
            $result = true;
        }

@@ -59,17 +60,17 @@ trait OBValidation
            // otherwise try to find the account:
            $search = $this->findExistingAccount($validTypes, $array);
            if (null === $search) {
-                app('log')->debug('findExistingAccount() returned NULL, so the result is false.', $validTypes);
+                Log::debug('findExistingAccount() returned NULL, so the result is false.', $validTypes);
                $this->destError = (string) trans('validation.ob_dest_bad_data', ['id' => $accountId, 'name' => $accountName]);
                $result          = false;
            }
            if (null !== $search) {
-                app('log')->debug(sprintf('findExistingAccount() returned #%d ("%s"), so the result is true.', $search->id, $search->name));
+                Log::debug(sprintf('findExistingAccount() returned #%d ("%s"), so the result is true.', $search->id, $search->name));
                $this->setDestination($search);
                $result = true;
            }
        }
-        app('log')->debug(sprintf('validateOBDestination(%d, "%s") will return %s', $accountId, $accountName, var_export($result, true)));
+        Log::debug(sprintf('validateOBDestination(%d, "%s") will return %s', $accountId, $accountName, var_export($result, true)));

        return $result;
    }
@@ -84,7 +85,7 @@ trait OBValidation
    {
        $accountId   = array_key_exists('id', $array) ? $array['id'] : null;
        $accountName = array_key_exists('name', $array) ? $array['name'] : null;
-        app('log')->debug('Now in validateOBSource', $array);
+        Log::debug('Now in validateOBSource', $array);
        $result      = null;
        // source can be any of the following types.
        $validTypes  = array_keys($this->combinations[$this->transactionType]);
@@ -100,19 +101,19 @@ trait OBValidation
        // if the user submits an ID only but that ID is not of the correct type,
        // return false.
        if (null !== $accountId && null === $accountName) {
-            app('log')->debug('Source ID is not null, but name is null.');
+            Log::debug('Source ID is not null, but name is null.');
            $search = $this->accountRepository->find($accountId);

            // the source resulted in an account, but it's not of a valid type.
            if (null !== $search && !in_array($search->accountType->type, $validTypes, true)) {
                $message           = sprintf('User submitted only an ID (#%d), which is a "%s", so this is not a valid source.', $accountId, $search->accountType->type);
-                app('log')->debug($message);
+                Log::debug($message);
                $this->sourceError = $message;
                $result            = false;
            }
            // the source resulted in an account, AND it's of a valid type.
            if (null !== $search && in_array($search->accountType->type, $validTypes, true)) {
-                app('log')->debug(sprintf('Found account of correct type: #%d, "%s"', $search->id, $search->name));
+                Log::debug(sprintf('Found account of correct type: #%d, "%s"', $search->id, $search->name));
                $this->setSource($search);
                $result = true;
            }
@@ -120,7 +121,7 @@ trait OBValidation

        // if the account can be created anyway we don't need to search.
        if (null === $result && true === $this->canCreateTypes($validTypes)) {
-            app('log')->debug('Result is still null.');
+            Log::debug('Result is still null.');
            $result               = true;

            // set the source to be a (dummy) initial balance account.
--- a/app/Validation/Account/WithdrawalValidation.php
+++ b/app/Validation/Account/WithdrawalValidation.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Validation\Account;

 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
+use Illuminate\Support\Facades\Log;

 /**
 * Trait WithdrawalValidation
@@ -37,14 +38,14 @@ trait WithdrawalValidation
        $accountId   = array_key_exists('id', $array) ? $array['id'] : null;
        $accountName = array_key_exists('name', $array) ? $array['name'] : null;
        $accountIban = array_key_exists('iban', $array) ? $array['iban'] : null;
-        app('log')->debug('Now in validateGenericSource', $array);
+        Log::debug('Now in validateGenericSource', $array);
        // source can be any of the following types.
        $validTypes  = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
        if (null === $accountId && null === $accountName && null === $accountIban && false === $this->canCreateTypes($validTypes)) {
            // if both values are NULL we return TRUE
            // because we assume the user doesn't want to submit / change anything.
            $this->sourceError = (string) trans('validation.withdrawal_source_need_data');
-            app('log')->warning('[a] Not a valid source. Need more data.');
+            Log::warning('[a] Not a valid source. Need more data.');

            return false;
        }
@@ -53,12 +54,12 @@ trait WithdrawalValidation
        $search      = $this->findExistingAccount($validTypes, $array);
        if (null === $search) {
            $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]);
-            app('log')->warning('Not a valid source. Cant find it.', $validTypes);
+            Log::warning('Not a valid source. Cant find it.', $validTypes);

            return false;
        }
        $this->setSource($search);
-        app('log')->debug('Valid source account!');
+        Log::debug('Valid source account!');

        return true;
    }
@@ -73,10 +74,10 @@ trait WithdrawalValidation
        $accountName   = array_key_exists('name', $array) ? $array['name'] : null;
        $accountIban   = array_key_exists('iban', $array) ? $array['iban'] : null;
        $accountNumber = array_key_exists('number', $array) ? $array['number'] : null;
-        app('log')->debug('Now in validateWithdrawalDestination()', $array);
+        Log::debug('Now in validateWithdrawalDestination()', $array);
        // source can be any of the following types.
        $validTypes    = $this->combinations[$this->transactionType][$this->source->accountType->type] ?? [];
-        app('log')->debug('Source type can be: ', $validTypes);
+        Log::debug('Source type can be: ', $validTypes);
        if (null === $accountId && null === $accountName && null === $accountIban && null === $accountNumber && false === $this->canCreateTypes($validTypes)) {
            // if both values are NULL return false,
            // because the destination of a withdrawal can never be created automatically.
@@ -86,7 +87,7 @@ trait WithdrawalValidation
        }

        // if there's an ID it must be of the "validTypes".
-        if (null !== $accountId && 0 !== $accountId) {
+        if (null !== $accountId && 0 !== $accountId && $accountId !== $this->source->id) {
            $found = $this->accountRepository->find($accountId);
            if (null !== $found) {
                $type            = $found->accountType->type;
@@ -104,7 +105,7 @@ trait WithdrawalValidation
        // if there is an iban, it can only be in use by a valid destination type, or we will fail.
        // the inverse of $validTypes is
        if (null !== $accountIban && '' !== $accountIban) {
-            app('log')->debug('Check if there is not already an account with this IBAN');
+            Log::debug('Check if there is not already an account with this IBAN');
            // the inverse flag reverses the search, searching for everything that is NOT a valid type.
            $existing = $this->findExistingAccount($validTypes, ['iban' => $accountIban], true);
            if (null !== $existing) {
@@ -125,14 +126,14 @@ trait WithdrawalValidation
        $accountIban   = array_key_exists('iban', $array) ? $array['iban'] : null;
        $accountNumber = array_key_exists('number', $array) ? $array['number'] : null;

-        app('log')->debug('Now in validateWithdrawalSource', $array);
+        Log::debug('Now in validateWithdrawalSource', $array);
        // source can be any of the following types.
        $validTypes    = array_keys($this->combinations[$this->transactionType]);
        if (null === $accountId && null === $accountName && null === $accountNumber && null === $accountIban && false === $this->canCreateTypes($validTypes)) {
            // if both values are NULL we return false,
            // because the source of a withdrawal can't be created.
            $this->sourceError = (string) trans('validation.withdrawal_source_need_data');
-            app('log')->warning('[b] Not a valid source. Need more data.');
+            Log::warning('[b] Not a valid source. Need more data.');

            return false;
        }
@@ -141,12 +142,12 @@ trait WithdrawalValidation
        $search        = $this->findExistingAccount($validTypes, $array);
        if (null === $search) {
            $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]);
-            app('log')->warning('Not a valid source. Cant find it.', $validTypes);
+            Log::warning('Not a valid source. Cant find it.', $validTypes);

            return false;
        }
        $this->setSource($search);
-        app('log')->debug('Valid source account!');
+        Log::debug('Valid source account!');

        return true;
    }
--- a/app/Validation/AccountValidator.php
+++ b/app/Validation/AccountValidator.php
@@ -36,6 +36,7 @@ use FireflyIII\Validation\Account\OBValidation;
 use FireflyIII\Validation\Account\ReconciliationValidation;
 use FireflyIII\Validation\Account\TransferValidation;
 use FireflyIII\Validation\Account\WithdrawalValidation;
+use Illuminate\Support\Facades\Log;

 /**
 * Class AccountValidator
@@ -80,10 +81,10 @@ class AccountValidator
    public function setSource(?Account $account): void
    {
        if (!$account instanceof Account) {
-            app('log')->debug('AccountValidator source is set to NULL');
+            Log::debug('AccountValidator source is set to NULL');
        }
        if ($account instanceof Account) {
-            app('log')->debug(sprintf('AccountValidator source is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType?->type));
+            Log::debug(sprintf('AccountValidator source is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType?->type));
        }
        $this->source = $account;
    }
@@ -91,17 +92,17 @@ class AccountValidator
    public function setDestination(?Account $account): void
    {
        if (!$account instanceof Account) {
-            app('log')->debug('AccountValidator destination is set to NULL');
+            Log::debug('AccountValidator destination is set to NULL');
        }
        if ($account instanceof Account) {
-            app('log')->debug(sprintf('AccountValidator destination is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType->type));
+            Log::debug(sprintf('AccountValidator destination is set to #%d: "%s" (%s)', $account->id, $account->name, $account->accountType->type));
        }
        $this->destination = $account;
    }

    public function setTransactionType(string $transactionType): void
    {
-        app('log')->debug(sprintf('Transaction type for validator is now "%s".', ucfirst($transactionType)));
+        Log::debug(sprintf('Transaction type for validator is now "%s".', ucfirst($transactionType)));
        $this->transactionType = ucfirst($transactionType);
    }

@@ -117,9 +118,9 @@ class AccountValidator

    public function validateDestination(array $array): bool
    {
-        app('log')->debug('Now in AccountValidator::validateDestination()', $array);
+        Log::debug('Now in AccountValidator::validateDestination()', $array);
        if (!$this->source instanceof Account) {
-            app('log')->error('Source is NULL, always FALSE.');
+            Log::error('Source is NULL, always FALSE.');
            $this->destError = 'No source account validation has taken place yet. Please do this first or overrule the object.';

            return false;
@@ -128,7 +129,7 @@ class AccountValidator
        switch ($this->transactionType) {
            default:
                $this->destError = sprintf('AccountValidator::validateDestination cannot handle "%s", so it will always return false.', $this->transactionType);
-                app('log')->error(sprintf('AccountValidator::validateDestination cannot handle "%s", so it will always return false.', $this->transactionType));
+                Log::error(sprintf('AccountValidator::validateDestination cannot handle "%s", so it will always return false.', $this->transactionType));

                $result          = false;

@@ -170,11 +171,11 @@ class AccountValidator

    public function validateSource(array $array): bool
    {
-        app('log')->debug('Now in AccountValidator::validateSource()', $array);
+        Log::debug('Now in AccountValidator::validateSource()', $array);

        switch ($this->transactionType) {
            default:
-                app('log')->error(sprintf('AccountValidator::validateSource cannot handle "%s", so it will do a generic check.', $this->transactionType));
+                Log::error(sprintf('AccountValidator::validateSource cannot handle "%s", so it will do a generic check.', $this->transactionType));
                $result = $this->validateGenericSource($array);

                break;
@@ -205,7 +206,7 @@ class AccountValidator
                break;

            case TransactionTypeEnum::RECONCILIATION->value:
-                app('log')->debug('Calling validateReconciliationSource');
+                Log::debug('Calling validateReconciliationSource');
                $result = $this->validateReconciliationSource($array);

                break;
@@ -216,17 +217,17 @@ class AccountValidator

    protected function canCreateTypes(array $accountTypes): bool
    {
-        app('log')->debug('Can we create any of these types?', $accountTypes);
+        Log::debug('Can we create any of these types?', $accountTypes);

        /** @var string $accountType */
        foreach ($accountTypes as $accountType) {
            if ($this->canCreateType($accountType)) {
-                app('log')->debug(sprintf('YES, we can create a %s', $accountType));
+                Log::debug(sprintf('YES, we can create a %s', $accountType));

                return true;
            }
        }
-        app('log')->debug('NO, we cant create any of those.');
+        Log::debug('NO, we cant create any of those.');

        return false;
    }
@@ -250,8 +251,8 @@ class AccountValidator
     */
    protected function findExistingAccount(array $validTypes, array $data, bool $inverse = false): ?Account
    {
-        app('log')->debug('Now in findExistingAccount', [$validTypes, $data]);
-        app('log')->debug('The search will be reversed!');
+        Log::debug('Now in findExistingAccount', [$validTypes, $data]);
+        Log::debug('The search will be reversed!');
        $accountId     = array_key_exists('id', $data) ? $data['id'] : null;
        $accountIban   = array_key_exists('iban', $data) ? $data['iban'] : null;
        $accountNumber = array_key_exists('number', $data) ? $data['number'] : null;
@@ -264,7 +265,7 @@ class AccountValidator
            $check       = in_array($accountType, $validTypes, true);
            $check       = $inverse ? !$check : $check; // reverse the validation check if necessary.
            if (($first instanceof Account) && $check) {
-                app('log')->debug(sprintf('ID: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));
+                Log::debug(sprintf('ID: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));

                return $first;
            }
@@ -277,7 +278,7 @@ class AccountValidator
            $check       = in_array($accountType, $validTypes, true);
            $check       = $inverse ? !$check : $check; // reverse the validation check if necessary.
            if (($first instanceof Account) && $check) {
-                app('log')->debug(sprintf('Iban: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));
+                Log::debug(sprintf('Iban: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));

                return $first;
            }
@@ -290,7 +291,7 @@ class AccountValidator
            $check       = in_array($accountType, $validTypes, true);
            $check       = $inverse ? !$check : $check; // reverse the validation check if necessary.
            if (($first instanceof Account) && $check) {
-                app('log')->debug(sprintf('Number: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));
+                Log::debug(sprintf('Number: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));

                return $first;
            }
@@ -300,12 +301,12 @@ class AccountValidator
        if ('' !== (string) $accountName) {
            $first = $this->accountRepository->findByName($accountName, $validTypes);
            if ($first instanceof Account) {
-                app('log')->debug(sprintf('Name: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));
+                Log::debug(sprintf('Name: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban'));

                return $first;
            }
        }
-        app('log')->debug('Found nothing in findExistingAccount()');
+        Log::debug('Found nothing in findExistingAccount()');

        return null;
    }
--- a/changelog.md
+++ b/changelog.md
@@ -8,6 +8,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed

 - Fixed a missing filter from [issue 10803](https://github.com/firefly-iii/firefly-iii/issues/10803).
+- #10891
+- #10920
+- #10921
+- #10833
+
+### API
+
+- #10908
+

 ## 6.4.0 - 2025-09-14

--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.29.0",
+            "version": "v12.30.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "a9e4c73086f5ba38383e9c1d74b84fe46aac730b"
+                "reference": "7f61e8679f9142f282a0184ac7ef9e3834bfd023"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a9e4c73086f5ba38383e9c1d74b84fe46aac730b",
-                "reference": "a9e4c73086f5ba38383e9c1d74b84fe46aac730b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/7f61e8679f9142f282a0184ac7ef9e3834bfd023",
+                "reference": "7f61e8679f9142f282a0184ac7ef9e3834bfd023",
                "shasum": ""
            },
            "require": {
@@ -1915,7 +1915,7 @@
                "monolog/monolog": "^3.0",
                "nesbot/carbon": "^3.8.4",
                "nunomaduro/termwind": "^2.0",
-                "phiki/phiki": "v2.0.0",
+                "phiki/phiki": "^2.0.0",
                "php": "^8.2",
                "psr/container": "^1.1.1|^2.0.1",
                "psr/log": "^1.0|^2.0|^3.0",
@@ -2094,7 +2094,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-09-16T14:15:03+00:00"
+            "time": "2025-09-18T21:07:07+00:00"
        },
        {
            "name": "laravel/passport",
@@ -4352,16 +4352,16 @@
        },
        {
            "name": "phiki/phiki",
-            "version": "v2.0.0",
+            "version": "v2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phikiphp/phiki.git",
-                "reference": "461f6dd7e91dc3a95463b42f549ac7d0aab4702f"
+                "reference": "fe51fe6dc31856cd776fd1b04ee74053a4271644"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/461f6dd7e91dc3a95463b42f549ac7d0aab4702f",
-                "reference": "461f6dd7e91dc3a95463b42f549ac7d0aab4702f",
+                "url": "https://api.github.com/repos/phikiphp/phiki/zipball/fe51fe6dc31856cd776fd1b04ee74053a4271644",
+                "reference": "fe51fe6dc31856cd776fd1b04ee74053a4271644",
                "shasum": ""
            },
            "require": {
@@ -4407,7 +4407,7 @@
            "description": "Syntax highlighting using TextMate grammars in PHP.",
            "support": {
                "issues": "https://github.com/phikiphp/phiki/issues",
-                "source": "https://github.com/phikiphp/phiki/tree/v2.0.0"
+                "source": "https://github.com/phikiphp/phiki/tree/v2.0.3"
            },
            "funding": [
                {
@@ -4419,7 +4419,7 @@
                    "type": "other"
                }
            ],
-            "time": "2025-08-28T18:20:27+00:00"
+            "time": "2025-09-19T11:50:41+00:00"
        },
        {
            "name": "php-http/client-common",
@@ -5045,21 +5045,21 @@
        },
        {
            "name": "pragmarx/google2fa-qrcode",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/antonioribeiro/google2fa-qrcode.git",
-                "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b"
+                "reference": "c23ebcc3a50de0d1566016a6dd1486e183bb78e1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/ce4d8a729b6c93741c607cfb2217acfffb5bf76b",
-                "reference": "ce4d8a729b6c93741c607cfb2217acfffb5bf76b",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/c23ebcc3a50de0d1566016a6dd1486e183bb78e1",
+                "reference": "c23ebcc3a50de0d1566016a6dd1486e183bb78e1",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1",
-                "pragmarx/google2fa": ">=4.0"
+                "pragmarx/google2fa": "^4.0|^5.0|^6.0|^7.0|^8.0"
            },
            "require-dev": {
                "bacon/bacon-qr-code": "^2.0",
@@ -5106,9 +5106,9 @@
            ],
            "support": {
                "issues": "https://github.com/antonioribeiro/google2fa-qrcode/issues",
-                "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v3.0.0"
+                "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v3.0.1"
            },
-            "time": "2021-08-15T12:53:48+00:00"
+            "time": "2025-09-19T23:02:26+00:00"
        },
        {
            "name": "pragmarx/random",
@@ -10810,16 +10810,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.7.1",
+            "version": "v3.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "2e653fd19585a825e283b42f38378b21ae481cc7"
+                "reference": "a761859a7487bd7d0cb8b662a7538a234d5bb5ae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/2e653fd19585a825e283b42f38378b21ae481cc7",
-                "reference": "2e653fd19585a825e283b42f38378b21ae481cc7",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/a761859a7487bd7d0cb8b662a7538a234d5bb5ae",
+                "reference": "a761859a7487bd7d0cb8b662a7538a234d5bb5ae",
                "shasum": ""
            },
            "require": {
@@ -10833,7 +10833,7 @@
                "illuminate/pipeline": "^11.44.2 || ^12.4.1",
                "illuminate/support": "^11.44.2 || ^12.4.1",
                "php": "^8.2",
-                "phpstan/phpstan": "^2.1.23"
+                "phpstan/phpstan": "^2.1.28"
            },
            "require-dev": {
                "doctrine/coding-standard": "^13",
@@ -10887,7 +10887,7 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.7.1"
+                "source": "https://github.com/larastan/larastan/tree/v3.7.2"
            },
            "funding": [
                {
@@ -10895,7 +10895,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-09-10T19:42:11+00:00"
+            "time": "2025-09-19T09:03:05+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -11404,16 +11404,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.26",
+            "version": "2.1.28",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b13345001a8553ec405b7741be0c6b8d7f8b5bf5"
+                "reference": "578fa296a166605d97b94091f724f1257185d278"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b13345001a8553ec405b7741be0c6b8d7f8b5bf5",
-                "reference": "b13345001a8553ec405b7741be0c6b8d7f8b5bf5",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578fa296a166605d97b94091f724f1257185d278",
+                "reference": "578fa296a166605d97b94091f724f1257185d278",
                "shasum": ""
            },
            "require": {
@@ -11458,7 +11458,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-09-16T11:33:46+00:00"
+            "time": "2025-09-19T08:58:49+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@@ -11557,16 +11557,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "12.3.7",
+            "version": "12.3.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9"
+                "reference": "99e692c6a84708211f7536ba322bbbaef57ac7fc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9",
-                "reference": "bbede0f5593dad37af3be6a6f8e6ae1885e8a0a9",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/99e692c6a84708211f7536ba322bbbaef57ac7fc",
+                "reference": "99e692c6a84708211f7536ba322bbbaef57ac7fc",
                "shasum": ""
            },
            "require": {
@@ -11622,7 +11622,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/12.3.7"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.8"
            },
            "funding": [
                {
@@ -11642,7 +11642,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-09-10T09:59:06+00:00"
+            "time": "2025-09-17T11:31:43+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -11891,16 +11891,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.3.11",
+            "version": "12.3.12",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6a62f2b394e042884e4997ddc8b8db1ce56a0009"
+                "reference": "729861f66944204f5b446ee1cb156f02f2a439a6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6a62f2b394e042884e4997ddc8b8db1ce56a0009",
-                "reference": "6a62f2b394e042884e4997ddc8b8db1ce56a0009",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/729861f66944204f5b446ee1cb156f02f2a439a6",
+                "reference": "729861f66944204f5b446ee1cb156f02f2a439a6",
                "shasum": ""
            },
            "require": {
@@ -11914,12 +11914,12 @@
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.7",
+                "phpunit/php-code-coverage": "^12.3.8",
                "phpunit/php-file-iterator": "^6.0.0",
                "phpunit/php-invoker": "^6.0.0",
                "phpunit/php-text-template": "^5.0.0",
                "phpunit/php-timer": "^8.0.0",
-                "sebastian/cli-parser": "^4.1.0",
+                "sebastian/cli-parser": "^4.2.0",
                "sebastian/comparator": "^7.1.3",
                "sebastian/diff": "^7.0.0",
                "sebastian/environment": "^8.0.3",
@@ -11968,7 +11968,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.11"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.12"
            },
            "funding": [
                {
@@ -11992,7 +11992,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-09-14T06:21:44+00:00"
+            "time": "2025-09-21T12:23:01+00:00"
        },
        {
            "name": "rector/rector",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-09-16',
-    'build_time'                   => 1758048808,
+    'version'                      => 'develop/2025-09-21',
+    'build_time'                   => 1758460398,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 26,

--- a/package-lock.json
+++ b/package-lock.json
@@ -1693,9 +1693,9 @@
            "license": "MIT"
        },
        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
-            "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
+            "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
            "cpu": [
                "ppc64"
            ],
@@ -1710,9 +1710,9 @@
            }
        },
        "node_modules/@esbuild/android-arm": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
-            "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
+            "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
            "cpu": [
                "arm"
            ],
@@ -1727,9 +1727,9 @@
            }
        },
        "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
-            "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
+            "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
            "cpu": [
                "arm64"
            ],
@@ -1744,9 +1744,9 @@
            }
        },
        "node_modules/@esbuild/android-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
-            "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
+            "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
            "cpu": [
                "x64"
            ],
@@ -1761,9 +1761,9 @@
            }
        },
        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
-            "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
+            "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
            "cpu": [
                "arm64"
            ],
@@ -1778,9 +1778,9 @@
            }
        },
        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
-            "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
+            "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
            "cpu": [
                "x64"
            ],
@@ -1795,9 +1795,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
-            "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
+            "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
            "cpu": [
                "arm64"
            ],
@@ -1812,9 +1812,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
-            "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
+            "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
            "cpu": [
                "x64"
            ],
@@ -1829,9 +1829,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
-            "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
+            "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
            "cpu": [
                "arm"
            ],
@@ -1846,9 +1846,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
-            "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
+            "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
            "cpu": [
                "arm64"
            ],
@@ -1863,9 +1863,9 @@
            }
        },
        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
-            "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
+            "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
            "cpu": [
                "ia32"
            ],
@@ -1880,9 +1880,9 @@
            }
        },
        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
-            "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
+            "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
            "cpu": [
                "loong64"
            ],
@@ -1897,9 +1897,9 @@
            }
        },
        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
-            "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
+            "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
            "cpu": [
                "mips64el"
            ],
@@ -1914,9 +1914,9 @@
            }
        },
        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
-            "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
+            "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
            "cpu": [
                "ppc64"
            ],
@@ -1931,9 +1931,9 @@
            }
        },
        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
-            "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
+            "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
            "cpu": [
                "riscv64"
            ],
@@ -1948,9 +1948,9 @@
            }
        },
        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
-            "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
+            "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
            "cpu": [
                "s390x"
            ],
@@ -1965,9 +1965,9 @@
            }
        },
        "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
-            "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
+            "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
            "cpu": [
                "x64"
            ],
@@ -1982,9 +1982,9 @@
            }
        },
        "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
-            "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
+            "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
            "cpu": [
                "arm64"
            ],
@@ -1999,9 +1999,9 @@
            }
        },
        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
-            "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
+            "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
            "cpu": [
                "x64"
            ],
@@ -2016,9 +2016,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
-            "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
+            "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
            "cpu": [
                "arm64"
            ],
@@ -2033,9 +2033,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
-            "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
+            "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
            "cpu": [
                "x64"
            ],
@@ -2050,9 +2050,9 @@
            }
        },
        "node_modules/@esbuild/openharmony-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
-            "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
+            "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
            "cpu": [
                "arm64"
            ],
@@ -2067,9 +2067,9 @@
            }
        },
        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
-            "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
+            "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
            "cpu": [
                "x64"
            ],
@@ -2084,9 +2084,9 @@
            }
        },
        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
-            "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
+            "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
            "cpu": [
                "arm64"
            ],
@@ -2101,9 +2101,9 @@
            }
        },
        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
-            "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
+            "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
            "cpu": [
                "ia32"
            ],
@@ -2118,9 +2118,9 @@
            }
        },
        "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
-            "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
+            "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
            "cpu": [
                "x64"
            ],
@@ -2589,9 +2589,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.2.tgz",
-            "integrity": "sha512-uLN8NAiFVIRKX9ZQha8wy6UUs06UNSZ32xj6giK/rmMXAgKahwExvK6SsmgU5/brh4w/nSgj8e0k3c1HBQpa0A==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.0.tgz",
+            "integrity": "sha512-VxDYCDqOaR7NXzAtvRx7G1u54d2kEHopb28YH/pKzY6y0qmogP3gG7CSiWsq9WvDFxOQMpNEyjVAHZFXfH3o/A==",
            "cpu": [
                "arm"
            ],
@@ -2603,9 +2603,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.2.tgz",
-            "integrity": "sha512-oEouqQk2/zxxj22PNcGSskya+3kV0ZKH+nQxuCCOGJ4oTXBdNTbv+f/E3c74cNLeMO1S5wVWacSws10TTSB77g==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.0.tgz",
+            "integrity": "sha512-pqDirm8koABIKvzL59YI9W9DWbRlTX7RWhN+auR8HXJxo89m4mjqbah7nJZjeKNTNYopqL+yGg+0mhCpf3xZtQ==",
            "cpu": [
                "arm64"
            ],
@@ -2617,9 +2617,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.2.tgz",
-            "integrity": "sha512-OZuTVTpj3CDSIxmPgGH8en/XtirV5nfljHZ3wrNwvgkT5DQLhIKAeuFSiwtbMto6oVexV0k1F1zqURPKf5rI1Q==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.0.tgz",
+            "integrity": "sha512-YCdWlY/8ltN6H78HnMsRHYlPiKvqKagBP1r+D7SSylxX+HnsgXGCmLiV3Y4nSyY9hW8qr8U9LDUx/Lo7M6MfmQ==",
            "cpu": [
                "arm64"
            ],
@@ -2631,9 +2631,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.2.tgz",
-            "integrity": "sha512-Wa/Wn8RFkIkr1vy1k1PB//VYhLnlnn5eaJkfTQKivirOvzu5uVd2It01ukeQstMursuz7S1bU+8WW+1UPXpa8A==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.0.tgz",
+            "integrity": "sha512-z4nw6y1j+OOSGzuVbSWdIp1IUks9qNw4dc7z7lWuWDKojY38VMWBlEN7F9jk5UXOkUcp97vA1N213DF+Lz8BRg==",
            "cpu": [
                "x64"
            ],
@@ -2645,9 +2645,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.2.tgz",
-            "integrity": "sha512-QkzxvH3kYN9J1w7D1A+yIMdI1pPekD+pWx7G5rXgnIlQ1TVYVC6hLl7SOV9pi5q9uIDF9AuIGkuzcbF7+fAhow==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.0.tgz",
+            "integrity": "sha512-Q/dv9Yvyr5rKlK8WQJZVrp5g2SOYeZUs9u/t2f9cQ2E0gJjYB/BWoedXfUT0EcDJefi2zzVfhcOj8drWCzTviw==",
            "cpu": [
                "arm64"
            ],
@@ -2659,9 +2659,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.2.tgz",
-            "integrity": "sha512-dkYXB0c2XAS3a3jmyDkX4Jk0m7gWLFzq1C3qUnJJ38AyxIF5G/dyS4N9B30nvFseCfgtCEdbYFhk0ChoCGxPog==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.0.tgz",
+            "integrity": "sha512-kdBsLs4Uile/fbjZVvCRcKB4q64R+1mUq0Yd7oU1CMm1Av336ajIFqNFovByipciuUQjBCPMxwJhCgfG2re3rg==",
            "cpu": [
                "x64"
            ],
@@ -2673,9 +2673,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.2.tgz",
-            "integrity": "sha512-9VlPY/BN3AgbukfVHAB8zNFWB/lKEuvzRo1NKev0Po8sYFKx0i+AQlCYftgEjcL43F2h9Ui1ZSdVBc4En/sP2w==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.0.tgz",
+            "integrity": "sha512-aL6hRwu0k7MTUESgkg7QHY6CoqPgr6gdQXRJI1/VbFlUMwsSzPGSR7sG5d+MCbYnJmJwThc2ol3nixj1fvI/zQ==",
            "cpu": [
                "arm"
            ],
@@ -2687,9 +2687,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.2.tgz",
-            "integrity": "sha512-+GdKWOvsifaYNlIVf07QYan1J5F141+vGm5/Y8b9uCZnG/nxoGqgCmR24mv0koIWWuqvFYnbURRqw1lv7IBINw==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.0.tgz",
+            "integrity": "sha512-BTs0M5s1EJejgIBJhCeiFo7GZZ2IXWkFGcyZhxX4+8usnIo5Mti57108vjXFIQmmJaRyDwmV59Tw64Ap1dkwMw==",
            "cpu": [
                "arm"
            ],
@@ -2701,9 +2701,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.2.tgz",
-            "integrity": "sha512-df0Eou14ojtUdLQdPFnymEQteENwSJAdLf5KCDrmZNsy1c3YaCNaJvYsEUHnrg+/DLBH612/R0xd3dD03uz2dg==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.0.tgz",
+            "integrity": "sha512-uj672IVOU9m08DBGvoPKPi/J8jlVgjh12C9GmjjBxCTQc3XtVmRkRKyeHSmIKQpvJ7fIm1EJieBUcnGSzDVFyw==",
            "cpu": [
                "arm64"
            ],
@@ -2715,9 +2715,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.2.tgz",
-            "integrity": "sha512-iPeouV0UIDtz8j1YFR4OJ/zf7evjauqv7jQ/EFs0ClIyL+by++hiaDAfFipjOgyz6y6xbDvJuiU4HwpVMpRFDQ==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.0.tgz",
+            "integrity": "sha512-/+IVbeDMDCtB/HP/wiWsSzduD10SEGzIZX2945KSgZRNi4TSkjHqRJtNTVtVb8IRwhJ65ssI56krlLik+zFWkw==",
            "cpu": [
                "arm64"
            ],
@@ -2729,9 +2729,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.50.2.tgz",
-            "integrity": "sha512-OL6KaNvBopLlj5fTa5D5bau4W82f+1TyTZRr2BdnfsrnQnmdxh4okMxR2DcDkJuh4KeoQZVuvHvzuD/lyLn2Kw==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.0.tgz",
+            "integrity": "sha512-U1vVzvSWtSMWKKrGoROPBXMh3Vwn93TA9V35PldokHGqiUbF6erSzox/5qrSMKp6SzakvyjcPiVF8yB1xKr9Pg==",
            "cpu": [
                "loong64"
            ],
@@ -2743,9 +2743,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.2.tgz",
-            "integrity": "sha512-I21VJl1w6z/K5OTRl6aS9DDsqezEZ/yKpbqlvfHbW0CEF5IL8ATBMuUx6/mp683rKTK8thjs/0BaNrZLXetLag==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.0.tgz",
+            "integrity": "sha512-X/4WfuBAdQRH8cK3DYl8zC00XEE6aM472W+QCycpQJeLWVnHfkv7RyBFVaTqNUMsTgIX8ihMjCvFF9OUgeABzw==",
            "cpu": [
                "ppc64"
            ],
@@ -2757,9 +2757,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.2.tgz",
-            "integrity": "sha512-Hq6aQJT/qFFHrYMjS20nV+9SKrXL2lvFBENZoKfoTH2kKDOJqff5OSJr4x72ZaG/uUn+XmBnGhfr4lwMRrmqCQ==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.0.tgz",
+            "integrity": "sha512-xIRYc58HfWDBZoLmWfWXg2Sq8VCa2iJ32B7mqfWnkx5mekekl0tMe7FHpY8I72RXEcUkaWawRvl3qA55og+cwQ==",
            "cpu": [
                "riscv64"
            ],
@@ -2771,9 +2771,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.2.tgz",
-            "integrity": "sha512-82rBSEXRv5qtKyr0xZ/YMF531oj2AIpLZkeNYxmKNN6I2sVE9PGegN99tYDLK2fYHJITL1P2Lgb4ZXnv0PjQvw==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.0.tgz",
+            "integrity": "sha512-mbsoUey05WJIOz8U1WzNdf+6UMYGwE3fZZnQqsM22FZ3wh1N887HT6jAOjXs6CNEK3Ntu2OBsyQDXfIjouI4dw==",
            "cpu": [
                "riscv64"
            ],
@@ -2785,9 +2785,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.2.tgz",
-            "integrity": "sha512-4Q3S3Hy7pC6uaRo9gtXUTJ+EKo9AKs3BXKc2jYypEcMQ49gDPFU2P1ariX9SEtBzE5egIX6fSUmbmGazwBVF9w==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.0.tgz",
+            "integrity": "sha512-qP6aP970bucEi5KKKR4AuPFd8aTx9EF6BvutvYxmZuWLJHmnq4LvBfp0U+yFDMGwJ+AIJEH5sIP+SNypauMWzg==",
            "cpu": [
                "s390x"
            ],
@@ -2799,9 +2799,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.2.tgz",
-            "integrity": "sha512-9Jie/At6qk70dNIcopcL4p+1UirusEtznpNtcq/u/C5cC4HBX7qSGsYIcG6bdxj15EYWhHiu02YvmdPzylIZlA==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.0.tgz",
+            "integrity": "sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA==",
            "cpu": [
                "x64"
            ],
@@ -2813,9 +2813,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.2.tgz",
-            "integrity": "sha512-HPNJwxPL3EmhzeAnsWQCM3DcoqOz3/IC6de9rWfGR8ZCuEHETi9km66bH/wG3YH0V3nyzyFEGUZeL5PKyy4xvw==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.0.tgz",
+            "integrity": "sha512-2d0qRo33G6TfQVjaMR71P+yJVGODrt5V6+T0BDYH4EMfGgdC/2HWDVjSSFw888GSzAZUwuska3+zxNUCDco6rQ==",
            "cpu": [
                "x64"
            ],
@@ -2827,9 +2827,9 @@
            ]
        },
        "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.2.tgz",
-            "integrity": "sha512-nMKvq6FRHSzYfKLHZ+cChowlEkR2lj/V0jYj9JnGUVPL2/mIeFGmVM2mLaFeNa5Jev7W7TovXqXIG2d39y1KYA==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.0.tgz",
+            "integrity": "sha512-A1JalX4MOaFAAyGgpO7XP5khquv/7xKzLIyLmhNrbiCxWpMlnsTYr8dnsWM7sEeotNmxvSOEL7F65j0HXFcFsw==",
            "cpu": [
                "arm64"
            ],
@@ -2841,9 +2841,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.2.tgz",
-            "integrity": "sha512-eFUvvnTYEKeTyHEijQKz81bLrUQOXKZqECeiWH6tb8eXXbZk+CXSG2aFrig2BQ/pjiVRj36zysjgILkqarS2YA==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.0.tgz",
+            "integrity": "sha512-YQugafP/rH0eOOHGjmNgDURrpYHrIX0yuojOI8bwCyXwxC9ZdTd3vYkmddPX0oHONLXu9Rb1dDmT0VNpjkzGGw==",
            "cpu": [
                "arm64"
            ],
@@ -2855,9 +2855,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.2.tgz",
-            "integrity": "sha512-cBaWmXqyfRhH8zmUxK3d3sAhEWLrtMjWBRwdMMHJIXSjvjLKvv49adxiEz+FJ8AP90apSDDBx2Tyd/WylV6ikA==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.0.tgz",
+            "integrity": "sha512-zYdUYhi3Qe2fndujBqL5FjAFzvNeLxtIqfzNEVKD1I7C37/chv1VxhscWSQHTNfjPCrBFQMnynwA3kpZpZ8w4A==",
            "cpu": [
                "ia32"
            ],
@@ -2868,10 +2868,24 @@
                "win32"
            ]
        },
+        "node_modules/@rollup/rollup-win32-x64-gnu": {
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.0.tgz",
+            "integrity": "sha512-fGk03kQylNaCOQ96HDMeT7E2n91EqvCDd3RwvT5k+xNdFCeMGnj5b5hEgTGrQuyidqSsD3zJDQ21QIaxXqTBJw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.2.tgz",
-            "integrity": "sha512-APwKy6YUhvZaEoHyM+9xqmTpviEI+9eL7LoCH+aLcvWYHJ663qG5zx7WzWZY+a9qkg5JtzcMyJ9z0WtQBMDmgA==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.0.tgz",
+            "integrity": "sha512-6iKDCVSIUQ8jPMoIV0OytRKniaYyy5EbY/RRydmLW8ZR3cEBhxbWl5ro0rkUNe0ef6sScvhbY79HrjRm8i3vDQ==",
            "cpu": [
                "x64"
            ],
@@ -3159,9 +3173,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "24.5.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.0.tgz",
-            "integrity": "sha512-y1dMvuvJspJiPSDZUQ+WMBvF7dpnEqN4x9DDC9ie5Fs/HUZJA3wFp7EhHoVaKX/iI0cRoECV8X2jL8zi0xrHCg==",
+            "version": "24.5.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
+            "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4061,9 +4075,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.8.4",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.4.tgz",
-            "integrity": "sha512-L+YvJwGAgwJBV1p6ffpSTa2KRc69EeeYGYjRVWKs0GKrK+LON0GC0gV+rKSNtALEDvMDqkvCFq9r1r94/Gjwxw==",
+            "version": "2.8.6",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz",
+            "integrity": "sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
@@ -5722,9 +5736,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.218",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.218.tgz",
-            "integrity": "sha512-uwwdN0TUHs8u6iRgN8vKeWZMRll4gBkz+QMqdS7DDe49uiK68/UX92lFb61oiFPrpYZNeZIqa4bA7O6Aiasnzg==",
+            "version": "1.5.222",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.222.tgz",
+            "integrity": "sha512-gA7psSwSwQRE60CEoLz6JBCQPIxNeuzB2nL8vE03GK/OHxlvykbLyeiumQy1iH5C2f3YbRAZpGCMT12a/9ih9w==",
            "dev": true,
            "license": "ISC"
        },
@@ -5885,9 +5899,9 @@
            }
        },
        "node_modules/esbuild": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
-            "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+            "version": "0.25.10",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
+            "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
            "dev": true,
            "hasInstallScript": true,
            "license": "MIT",
@@ -5898,32 +5912,32 @@
                "node": ">=18"
            },
            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.9",
-                "@esbuild/android-arm": "0.25.9",
-                "@esbuild/android-arm64": "0.25.9",
-                "@esbuild/android-x64": "0.25.9",
-                "@esbuild/darwin-arm64": "0.25.9",
-                "@esbuild/darwin-x64": "0.25.9",
-                "@esbuild/freebsd-arm64": "0.25.9",
-                "@esbuild/freebsd-x64": "0.25.9",
-                "@esbuild/linux-arm": "0.25.9",
-                "@esbuild/linux-arm64": "0.25.9",
-                "@esbuild/linux-ia32": "0.25.9",
-                "@esbuild/linux-loong64": "0.25.9",
-                "@esbuild/linux-mips64el": "0.25.9",
-                "@esbuild/linux-ppc64": "0.25.9",
-                "@esbuild/linux-riscv64": "0.25.9",
-                "@esbuild/linux-s390x": "0.25.9",
-                "@esbuild/linux-x64": "0.25.9",
-                "@esbuild/netbsd-arm64": "0.25.9",
-                "@esbuild/netbsd-x64": "0.25.9",
-                "@esbuild/openbsd-arm64": "0.25.9",
-                "@esbuild/openbsd-x64": "0.25.9",
-                "@esbuild/openharmony-arm64": "0.25.9",
-                "@esbuild/sunos-x64": "0.25.9",
-                "@esbuild/win32-arm64": "0.25.9",
-                "@esbuild/win32-ia32": "0.25.9",
-                "@esbuild/win32-x64": "0.25.9"
+                "@esbuild/aix-ppc64": "0.25.10",
+                "@esbuild/android-arm": "0.25.10",
+                "@esbuild/android-arm64": "0.25.10",
+                "@esbuild/android-x64": "0.25.10",
+                "@esbuild/darwin-arm64": "0.25.10",
+                "@esbuild/darwin-x64": "0.25.10",
+                "@esbuild/freebsd-arm64": "0.25.10",
+                "@esbuild/freebsd-x64": "0.25.10",
+                "@esbuild/linux-arm": "0.25.10",
+                "@esbuild/linux-arm64": "0.25.10",
+                "@esbuild/linux-ia32": "0.25.10",
+                "@esbuild/linux-loong64": "0.25.10",
+                "@esbuild/linux-mips64el": "0.25.10",
+                "@esbuild/linux-ppc64": "0.25.10",
+                "@esbuild/linux-riscv64": "0.25.10",
+                "@esbuild/linux-s390x": "0.25.10",
+                "@esbuild/linux-x64": "0.25.10",
+                "@esbuild/netbsd-arm64": "0.25.10",
+                "@esbuild/netbsd-x64": "0.25.10",
+                "@esbuild/openbsd-arm64": "0.25.10",
+                "@esbuild/openbsd-x64": "0.25.10",
+                "@esbuild/openharmony-arm64": "0.25.10",
+                "@esbuild/sunos-x64": "0.25.10",
+                "@esbuild/win32-arm64": "0.25.10",
+                "@esbuild/win32-ia32": "0.25.10",
+                "@esbuild/win32-x64": "0.25.10"
            }
        },
        "node_modules/escalade": {
@@ -10145,9 +10159,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.50.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.50.2.tgz",
-            "integrity": "sha512-BgLRGy7tNS9H66aIMASq1qSYbAAJV6Z6WR4QYTvj5FgF15rZ/ympT1uixHXwzbZUBDbkvqUI1KR0fH1FhMaQ9w==",
+            "version": "4.52.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.0.tgz",
+            "integrity": "sha512-+IuescNkTJQgX7AkIDtITipZdIGcWF0pnVvZTWStiazUmcGA2ag8dfg0urest2XlXUi9kuhfQ+qmdc5Stc3z7g==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10161,27 +10175,28 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.50.2",
-                "@rollup/rollup-android-arm64": "4.50.2",
-                "@rollup/rollup-darwin-arm64": "4.50.2",
-                "@rollup/rollup-darwin-x64": "4.50.2",
-                "@rollup/rollup-freebsd-arm64": "4.50.2",
-                "@rollup/rollup-freebsd-x64": "4.50.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.50.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.50.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.50.2",
-                "@rollup/rollup-linux-arm64-musl": "4.50.2",
-                "@rollup/rollup-linux-loong64-gnu": "4.50.2",
-                "@rollup/rollup-linux-ppc64-gnu": "4.50.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.50.2",
-                "@rollup/rollup-linux-riscv64-musl": "4.50.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.50.2",
-                "@rollup/rollup-linux-x64-gnu": "4.50.2",
-                "@rollup/rollup-linux-x64-musl": "4.50.2",
-                "@rollup/rollup-openharmony-arm64": "4.50.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.50.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.50.2",
-                "@rollup/rollup-win32-x64-msvc": "4.50.2",
+                "@rollup/rollup-android-arm-eabi": "4.52.0",
+                "@rollup/rollup-android-arm64": "4.52.0",
+                "@rollup/rollup-darwin-arm64": "4.52.0",
+                "@rollup/rollup-darwin-x64": "4.52.0",
+                "@rollup/rollup-freebsd-arm64": "4.52.0",
+                "@rollup/rollup-freebsd-x64": "4.52.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.52.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.52.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.52.0",
+                "@rollup/rollup-linux-arm64-musl": "4.52.0",
+                "@rollup/rollup-linux-loong64-gnu": "4.52.0",
+                "@rollup/rollup-linux-ppc64-gnu": "4.52.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.52.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.52.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.52.0",
+                "@rollup/rollup-linux-x64-gnu": "4.52.0",
+                "@rollup/rollup-linux-x64-musl": "4.52.0",
+                "@rollup/rollup-openharmony-arm64": "4.52.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.52.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.52.0",
+                "@rollup/rollup-win32-x64-gnu": "4.52.0",
+                "@rollup/rollup-win32-x64-msvc": "4.52.0",
                "fsevents": "~2.3.2"
            }
        },
@@ -10237,9 +10252,9 @@
            "license": "MIT"
        },
        "node_modules/sass": {
-            "version": "1.92.1",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.92.1.tgz",
-            "integrity": "sha512-ffmsdbwqb3XeyR8jJR6KelIXARM9bFQe8A6Q3W4Klmwy5Ckd5gz7jgUNHo4UOqutU5Sk1DtKLbpDP0nLCg1xqQ==",
+            "version": "1.93.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.0.tgz",
+            "integrity": "sha512-CQi5/AzCwiubU3dSqRDJ93RfOfg/hhpW1l6wCIvolmehfwgCI35R/0QDs1+R+Ygrl8jFawwwIojE2w47/mf94A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -11554,9 +11569,9 @@
            }
        },
        "node_modules/vite": {
-            "version": "7.1.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.5.tgz",
-            "integrity": "sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==",
+            "version": "7.1.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.6.tgz",
+            "integrity": "sha512-SRYIB8t/isTwNn8vMB3MR6E+EQZM/WG1aKmmIUCfDXfVvKfc20ZpamngWHKzAmmu9ppsgxsg4b2I7c90JZudIQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/resources/assets/v1/src/locales/cs.json
+++ b/resources/assets/v1/src/locales/cs.json
@@ -53,7 +53,7 @@
        "external_url": "Extern\u00ed URL adresa",
        "update_transaction": "Aktualizovat transakci",
        "after_update_create_another": "Po aktualizaci se vr\u00e1tit sem pro pokra\u010dov\u00e1n\u00ed v \u00faprav\u00e1ch.",
-        "store_as_new": "Store as a new transaction instead of updating.",
+        "store_as_new": "Vytvo\u0159it novou transakci m\u00edsto aktualizov\u00e1n\u00ed t\u00e9 sou\u010dasn\u00e9.",
        "split_title_help": "Pokud vytvo\u0159\u00edte roz\u00fa\u010dtov\u00e1n\u00ed, je t\u0159eba, aby zde byl celkov\u00fd popis pro v\u0161echna roz\u00fa\u010dtov\u00e1n\u00ed dan\u00e9 transakce.",
        "none_in_select_list": "(\u017e\u00e1dn\u00e9)",
        "no_piggy_bank": "(\u017e\u00e1dn\u00e1 pokladni\u010dka)",
--- a/resources/assets/v1/src/locales/it.json
+++ b/resources/assets/v1/src/locales/it.json
@@ -2,9 +2,9 @@
    "firefly": {
        "administrations_page_title": "Amministrazioni finanziarie",
        "administrations_index_menu": "Amministrazioni finanziarie",
-        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
+        "expires_at": "Scade il",
+        "temp_administrations_introduction": "Firefly III avr\u00e0 presto la possibilit\u00e0 di gestire pi\u00f9 amministrazioni finanziarie. Al momento, ne hai solo una. Puoi impostare il titolo di questa amministrazione e la sua valuta principale. Questa impostazione sostituisce la precedente, che prevedeva di impostare la \"valuta predefinita\". Questa impostazione \u00e8 ora legata all'amministrazione finanziaria e pu\u00f2 essere diversa per ogni amministrazione.",
+        "administration_currency_form_help": "Se modifichi la valuta principale, il caricamento della pagina potrebbe richiedere molto tempo, poich\u00e9 potrebbe essere necessario convertire la transazione nella (nuova) valuta principale.",
        "administrations_page_edit_sub_title_js": "Modifica amministrazione finanziaria \"{title}\"",
        "table": "Tabella",
        "welcome_back": "La tua situazione finanziaria",
@@ -102,23 +102,23 @@
        "profile_oauth_client_secret_title": "Segreto del client",
        "profile_oauth_client_secret_expl": "Ecco il segreto del nuovo client. Questa \u00e8 l'unica occasione in cui viene mostrato pertanto non perderlo! Ora puoi usare questo segreto per effettuare delle richieste alle API.",
        "profile_oauth_confidential": "Riservato",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Richiedere al client di autenticarsi con un segreto. I client riservati possono conservare le credenziali in modo sicuro senza esporle a soggetti non autorizzati. Le applicazioni pubbliche, come le applicazioni desktop native o le applicazioni SPA JavaScript, non sono in grado di conservare i segreti in modo sicuro.",
        "multi_account_warning_unknown": "A seconda del tipo di transazione che hai creato, il conto di origine e\/o destinazione delle successive suddivisioni pu\u00f2 essere sovrascritto da qualsiasi cosa sia definita nella prima suddivisione della transazione.",
        "multi_account_warning_withdrawal": "Ricorda che il conto di origine delle successive suddivisioni verr\u00e0 sovrascritto da quello definito nella prima suddivisione del prelievo.",
        "multi_account_warning_deposit": "Ricorda che il conto di destinazione delle successive suddivisioni verr\u00e0 sovrascritto da quello definito nella prima suddivisione del deposito.",
        "multi_account_warning_transfer": "Ricorda che il conto di origine e il conto di destinazione delle successive suddivisioni verranno sovrascritti da quelli definiti nella prima suddivisione del trasferimento.",
-        "webhook_trigger_ANY": "After any event",
+        "webhook_trigger_ANY": "Dopo ogni evento",
        "webhook_trigger_STORE_TRANSACTION": "Dopo aver creato la transazione",
        "webhook_trigger_UPDATE_TRANSACTION": "Dopo aver aggiornato la transazione",
        "webhook_trigger_DESTROY_TRANSACTION": "Dopo aver eliminato la transazione",
-        "webhook_trigger_STORE_BUDGET": "After budget creation",
-        "webhook_trigger_UPDATE_BUDGET": "After budget update",
-        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
-        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
+        "webhook_trigger_STORE_BUDGET": "Dopo la creazione del budget",
+        "webhook_trigger_UPDATE_BUDGET": "Dopo l'aggiornamento del budget",
+        "webhook_trigger_DESTROY_BUDGET": "Dopo l'eliminazione del budget",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Dopo la modifica dell'importo preventivato",
        "webhook_response_TRANSACTIONS": "Dettagli transazione",
-        "webhook_response_RELEVANT": "Relevant details",
+        "webhook_response_RELEVANT": "Dettagli rilevanti",
        "webhook_response_ACCOUNTS": "Dettagli conto",
-        "webhook_response_NONE": "No details",
+        "webhook_response_NONE": "Nessun dettaglio",
        "webhook_delivery_JSON": "JSON",
        "actions": "Azioni",
        "meta_data": "Meta dati",
--- a/resources/assets/v2/src/pages/dashboard/accounts.js
+++ b/resources/assets/v2/src/pages/dashboard/accounts.js
@@ -211,14 +211,6 @@ export default () => ({
                    (new Get).show(accountId, new Date(window.store.get('end'))).then((response) => {
                        let parent = response.data.data;

-                        // apply function to each element of parent:
-                        // parent.attributes.balances = parent.attributes.balances.map((balance) => {
-                        //     balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);
-                        //     return balance;
-                        // });
-                        // console.log(parent);
-
-
                        // get groups for account:
                        const params = {
                            page: 1,
@@ -261,11 +253,14 @@ export default () => ({
                            accounts.push({
                                name: parent.attributes.name,
                                order: parent.attributes.order,
+
+                                current_balance: formatMoney(parent.attributes.current_balance, parent.attributes.currency_code),
+                                pc_current_balance: null === parent.attributes.pc_current_balance ? null : formatMoney(parent.attributes.pc_current_balance, parent.attributes.primary_currency_code),
+
                                id: parent.id,
-                                balances: parent.attributes.balances,
+                                //balances: parent.attributes.balances,
                                groups: groups,
                            });
-                            // console.log(parent.attributes);
                            count++;
                            if (count === totalAccounts) {
                                accounts.sort((a, b) => a.order - b.order); // b - a for reverse sort
--- a/resources/assets/v2/src/pages/dashboard/categories.js
+++ b/resources/assets/v2/src/pages/dashboard/categories.js
@@ -54,46 +54,69 @@ export default () => ({
            if (data.hasOwnProperty(i)) {
                let current = data[i];
                let code = current.currency_code;
-                if (!series.hasOwnProperty(code)) {
-                    series[code] = {
-                        name: code,
-                        yAxisID: '',
-                        data: {},
-                    };
+
+                // create two series, "spent" and "earned".
+                for(const type of ['spent', 'earned']) {
+                    let typeCode = code + '_' + type;
+                    if (!series.hasOwnProperty(typeCode)) {
+                        series[typeCode] = {
+                            name: typeCode,
+                            code: code,
+                            type: type,
+                            yAxisID: '',
+                            data: {},
+                        };
+                    }
+                }
+                if (!currencies.includes(code)) {
                    currencies.push(code);
                }
            }
        }
-
        // loop data again to add amounts to each series.
        for (const i in data) {
            if (data.hasOwnProperty(i)) {
                let yAxis = 'y';
                let current = data[i];
+
+                // allow switch to primary currency.
                let code = current.currency_code;
+                if(this.convertToPrimary) {
+                    code = current.primary_currency_code;
+                }

-                // loop series, add 0 if not present or add actual amount.
-                for (const ii in series) {
-                    if (series.hasOwnProperty(ii)) {
-                        let amount = 0.0;
-                        if (code === ii) {
-                            // this series' currency matches this column's currency.
-                            amount = parseFloat(current.amount);
-                            yAxis = 'y' + current.currency_code;
-                        }
-                        if (series[ii].data.hasOwnProperty(current.label)) {
-                            // there is a value for this particular currency. The amount from this column will be added.
-                            // (even if this column isn't recorded in this currency and a new filler value is written)
-                            // this is so currency conversion works.
-                            series[ii].data[current.label] = series[ii].data[current.label] + amount;
-                        }
+                // twice again, for speny AND earned.
+                for(const type of ['spent', 'earned']) {
+                    let typeCode = code + '_' + type;
+                    // loop series, add 0 if not present or add actual amount.
+                    for (const ii in series) {
+                        if (series.hasOwnProperty(typeCode)) {
+                            let amount = 0.0;
+                            if (typeCode === ii) {
+                                // this series' currency matches this column's currency.
+                                amount = parseFloat(current.entries[type]);
+                                if(this.convertToPrimary) {
+                                    amount = parseFloat(current.entries.pc_entries[type]);
+                                }
+                                yAxis = 'y' + typeCode;
+                            }
+                            if (series[typeCode].data.hasOwnProperty(current.label)) {
+                                // there is a value for this particular currency. The amount from this column will be added.
+                                // (even if this column isn't recorded in this currency and a new filler value is written)
+                                // this is so currency conversion works.
+                                series[typeCode].data[current.label] = series[typeCode].data[current.label] + amount;
+                            }

-                        if (!series[ii].data.hasOwnProperty(current.label)) {
-                            // this column's amount is not yet set in this series.
-                            series[ii].data[current.label] = amount;
+                            if (!series[typeCode].data.hasOwnProperty(current.label)) {
+                                // this column's amount is not yet set in this series.
+                                series[typeCode].data[current.label] = amount;
+                            }
                        }
                    }
                }
+
+
+
                // add label to x-axis, not unimportant.
                if (!options.data.labels.includes(current.label)) {
                    options.data.labels.push(current.label);
@@ -103,11 +126,11 @@ export default () => ({
        // loop the series and create ChartJS-compatible data sets.
        let count = 0;
        for (const i in series) {
-            // console.log('series');
            let yAxisID = 'y' + i;
+            let currencyCode = i.replace('_spent', '').replace('_earned', '');
            let dataset = {
                label: i,
-                currency_code: i,
+                currency_code: currencyCode,
                yAxisID: yAxisID,
                data: [],
                // backgroundColor: getColors(null, 'background'),
@@ -148,16 +171,15 @@ export default () => ({
        const end = new Date(window.store.get('end'));
        const cacheKey = getCacheKey('ds_ct_chart', {convertToPrimary: this.convertToPrimary, start: start, end: end});

-        const cacheValid = window.store.get('cacheValid');
+        // const cacheValid = window.store.get('cacheValid');
+        const cacheValid = false;
        let cachedData = window.store.get(cacheKey);
-
        if (cacheValid && typeof cachedData !== 'undefined') {
            chartData = cachedData; // save chart data for later.
            this.drawChart(this.generateOptions(chartData));
            this.loading = false;
            return;
        }
-
        const dashboard = new Dashboard();
        dashboard.dashboard(start, end, null).then((response) => {
            chartData = response.data; // save chart data for later.
@@ -181,7 +203,6 @@ export default () => ({
        this.getFreshData();
    },
    init() {
-        // console.log('categories init');
        Promise.all([getVariable('convert_to_primary', false),]).then((values) => {
            this.convertToPrimary = values[0];
            afterPromises = true;
--- a/resources/assets/v2/src/pages/transactions/edit.js
+++ b/resources/assets/v2/src/pages/transactions/edit.js
@@ -72,8 +72,6 @@ let transactions = function () {
            resetButton: true,
            rulesButton: true,
            webhooksButton: true,
-
-
        },

        // form behaviour during transaction
@@ -85,7 +83,7 @@ let transactions = function () {

        // form data (except transactions) is stored in formData
        formData: {
-            defaultCurrency: null,
+            primaryCurrency: null,
            enabledCurrencies: [],
            primaryCurrencies: [],
            foreignCurrencies: [],
@@ -200,8 +198,7 @@ let transactions = function () {
                // addedSplit, is called from the HTML
                // for source account
                const renderAccount = function (item, b, c) {
-                    console.log(item);
-                    return item.title + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.meta.type) + '</small>';
+                    return item.name_with_balance + '<br><small class="text-muted">' + i18next.t('firefly.account_type_' + item.type) + '</small>';
                };
                addAutocomplete({
                    selector: 'input.ac-source',
@@ -209,7 +206,7 @@ let transactions = function () {
                    account_types: this.filters.source,
                    onRenderItem: renderAccount,
                    valueField: 'id',
-                    labelField: 'title',
+                    labelField: 'name',
                    onChange: changeSourceAccount,
                    onSelectItem: selectSourceAccount
                });
@@ -217,7 +214,7 @@ let transactions = function () {
                    selector: 'input.ac-dest',
                    serverUrl: urls.account,
                    valueField: 'id',
-                    labelField: 'title',
+                    labelField: 'name',
                    account_types: this.filters.destination,
                    onRenderItem: renderAccount,
                    onChange: changeDestinationAccount,
@@ -227,7 +224,7 @@ let transactions = function () {
                    selector: 'input.ac-category',
                    serverUrl: urls.category,
                    valueField: 'id',
-                    labelField: 'title',
+                    labelField: 'name',
                    onChange: changeCategory,
                    onSelectItem: changeCategory
                });
@@ -330,7 +327,7 @@ let transactions = function () {
            // load meta data.
            loadCurrencies().then(data => {
                this.formStates.loadingCurrencies = false;
-                this.formData.defaultCurrency = data.defaultCurrency;
+                this.formData.primaryCurrency = data.primaryCurrency;
                this.formData.enabledCurrencies = data.enabledCurrencies;
                this.formData.primaryCurrencies = data.primaryCurrencies;
                this.formData.foreignCurrencies = data.foreignCurrencies;
--- a/resources/assets/v2/src/pages/transactions/shared/load-currencies.js
+++ b/resources/assets/v2/src/pages/transactions/shared/load-currencies.js
@@ -28,7 +28,7 @@ export function loadCurrencies() {
    let getter = new Get();
    return getter.list(params).then((response) => {
        let returnData = {
-            defaultCurrency: {},
+            primaryCurrency: {},
            primaryCurrencies: [],
            foreignCurrencies: [],
            enabledCurrencies: [],
@@ -46,13 +46,13 @@ export function loadCurrencies() {
                            id: current.id,
                            name: current.attributes.name,
                            code: current.attributes.code,
-                            default: current.attributes.default,
+                            primary: current.attributes.primary,
                            symbol: current.attributes.symbol,
                            decimal_places: current.attributes.decimal_places,

                        };
-                    if (obj.default) {
-                        returnData.defaultCurrency = obj;
+                    if (obj.primary) {
+                        returnData.primaryCurrency = obj;
                    }
                    returnData.enabledCurrencies.push(obj);
                    returnData.primaryCurrencies.push(obj);
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -24,10 +24,10 @@
 declare(strict_types=1);

 return [
-    'limit_exists' => 'There is already a budget limit (amount) for this budget and currency in the given period.',
+    'limit_exists'                   => 'There is already a budget limit (amount) for this budget and currency in the given period.',
    'invalid_sort_instruction'       => 'The sort instruction is invalid for an object of type ":object".',
-    'invalid_sort_instruction_index'       => 'The sort instruction at index #:index is invalid for an object of type ":object".',
-    'no_sort_instructions' => 'There are no sort instructions defined for an object of type ":object".',
+    'invalid_sort_instruction_index' => 'The sort instruction at index #:index is invalid for an object of type ":object".',
+    'no_sort_instructions'           => 'There are no sort instructions defined for an object of type ":object".',
    'webhook_budget_info'            => 'Cannot deliver budget information for transaction related webhooks.',
    'webhook_account_info'           => 'Cannot deliver account information for budget related webhooks.',
    'webhook_transaction_info'       => 'Cannot deliver transaction information for budget related webhooks.',
@@ -40,8 +40,8 @@ return [
    'nog_logged_in'                  => 'You are not logged in.',
    'prohibited'                     => 'You must not submit anything in field.',
    'bad_webhook_combination'        => 'Webhook trigger ":trigger" cannot be combined with webhook response ":response".',
-    'unknown_webhook_trigger' => 'Unknown webhook trigger ":trigger".',
-    'only_any_trigger' => 'If you select the "Any event"-trigger, you may not select any other triggers.',
+    'unknown_webhook_trigger'        => 'Unknown webhook trigger ":trigger".',
+    'only_any_trigger'               => 'If you select the "Any event"-trigger, you may not select any other triggers.',
    'bad_type_source'                => 'Firefly III can\'t determine the transaction type based on this source account.',
    'bad_type_destination'           => 'Firefly III can\'t determine the transaction type based on this destination account.',
    'missing_where'                  => 'Array is missing "where"-clause',
@@ -123,7 +123,7 @@ return [
    'between.file'               => 'The :attribute must be between :min and :max kilobytes.',
    'between.string'             => 'The :attribute must be between :min and :max characters.',
    'between.array'              => 'The :attribute must have between :min and :max items.',
-    'between_date'              => 'The date must be between the given start and end date.',
+    'between_date'               => 'The date must be between the given start and end date.',
    'boolean'                    => 'The :attribute field must be true or false.',
    'confirmed'                  => 'The :attribute confirmation does not match.',
    'date'                       => 'The :attribute is not a valid date.',
--- a/resources/views/recurring/edit.twig
+++ b/resources/views/recurring/edit.twig
@@ -134,9 +134,9 @@

                        {# BILL ONLY WHEN CREATING A WITHDRAWAL #}
                        {% if bills|length > 1 %}
-                            {{ ExpandedForm.select('bill_id', bills, array.transactions[0].bill_id) }}
+                            {{ ExpandedForm.select('bill_id', bills, array.transactions[0].subscription_id) }}
                        {% else %}
-                            {{ ExpandedForm.select('bill_id', bills, array.transactions[0].bill_id, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
+                            {{ ExpandedForm.select('bill_id', bills, array.transactions[0].subscription_id, {helpText: trans('firefly.no_bill_pointer', {link: route('subscriptions.index')})}) }}
                        {% endif %}

                        {# TAGS #}
--- a/resources/views/v2/partials/dashboard/account-list.blade.php
+++ b/resources/views/v2/partials/dashboard/account-list.blade.php
@@ -9,16 +9,10 @@
            <div class="card">
                <div class="card-header">
                    <h3 class="card-title">
-                        <a :href="'{{ route('accounts.show', '') }}/' + account.id"
-                           x-text="account.name"></a>
-
+                        <a :href="'{{ route('accounts.show', '') }}/' + account.id" x-text="account.name"></a>
                        <span class="small">
-                            <template x-for="balance in account.balances">
-                                <template x-if="balance.type === 'current'">
-                                    <span class="text-muted">(<span x-text="balance.amount_formatted"></span>)
-                                        </span>
-                                </template>
-                            </template>
+                            <span class="text-muted">(<span x-text="account.current_balance"></span>)</span>
+                            <template x-if="null !== account.pc_current_balance"><span class="text-muted">(<span x-text="account.pc_current_balance"></span>)</span></template>
                        </span>
                    </h3>
                </div>
Author	SHA1	Message	Date
github-actions[bot]	2af5e6eeef	Merge pull request #10942 from firefly-iii/release-1758460508 🤖 Automatically merge the PR into the develop branch.	2025-09-21 15:15:17 +02:00
JC5	013c43f9f2	🤖 Auto commit for release 'develop' on 2025-09-21	2025-09-21 15:15:08 +02:00
James Cole	7e08a1f33c	Possible fix for #10940 , not sure.	2025-09-21 15:11:16 +02:00
James Cole	e592b56d7a	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-09-21 15:06:32 +02:00
github-actions[bot]	a2479f71fe	Merge pull request #10937 from firefly-iii/release-1758437913 🤖 Automatically merge the PR into the develop branch.	2025-09-21 08:58:42 +02:00
JC5	7d3b993b98	🤖 Auto commit for release 'develop' on 2025-09-21	2025-09-21 08:58:33 +02:00
James Cole	90623101a3	Add earned + spent, needs cleaning up still.	2025-09-21 08:54:26 +02:00
github-actions[bot]	e2eca79b25	Merge pull request #10936 from firefly-iii/release-1758436089 🤖 Automatically merge the PR into the develop branch.	2025-09-21 08:28:16 +02:00
JC5	8c0ee8f024	🤖 Auto commit for release 'develop' on 2025-09-21	2025-09-21 08:28:09 +02:00
James Cole	69cae3ae55	Fix autocomplete.	2025-09-21 08:13:13 +02:00
James Cole	8a06298385	Repair charts and balances.	2025-09-21 07:35:46 +02:00
James Cole	acc3c294d8	Fix #10924	2025-09-17 20:46:03 +02:00
James Cole	dbf7dba421	Fix #10916	2025-09-17 20:04:24 +02:00
James Cole	65813f290d	Expand changelog.	2025-09-17 13:48:56 +02:00
James Cole	3491fbb99d	Force account search to validate it did not just find the source account. #10920	2025-09-17 07:09:40 +02:00
James Cole	cb6b3d5f85	Fix #10891	2025-09-16 21:09:29 +02:00