Merge pull request #11545 from firefly-iii/release-1768729993

🤖 Automatically merge the PR into the develop branch.

.env.example

@@ -14,7 +14,15 @@ SITE_OWNER=mail@example.com
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
 #
-# Avoid the "#" character in your APP_KEY, it may break things.
+# Try to avoid special characters like #, < and > in your app key. This string does not need full entropy
+# When in doubt, follow the link below and pick one.
+#
+# https://www.random.org/strings/?num=5&len=32&digits=on&upperalpha=on&loweralpha=on&unique=on&format=html&rnd=new
+#
+# If you are a fancy linux nerd like me, use this command:
+#
+# head /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9' | head -c 32 && echo
+#
 #
 APP_KEY=SomeRandomStringOf32CharsExactly
 

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 class RestoresOAuthKeys extends Command
 {
@@ -40,7 +41,9 @@ class RestoresOAuthKeys extends Command
      */
     public function handle(): int
     {
+        Log::debug('Restore OAuth Keys command.');
         $this->restoreOAuthKeys();
+        Log::debug('Done with OAuth Keys command.');
 
         return 0;
     }

app/Events/Model/Subscription/SubscriptionNeedsExtensionOrRenewal.php

@@ -1,10 +1,8 @@
 <?php
 
-
-
 /*
- * WarnUserAboutBill.php
- * Copyright (c) 2025 james@firefly-iii.org
+ * SubscriptionNeedsExtensionOrRenewal.php
+ * Copyright (c) 2026 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -24,18 +22,15 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Events\Model\Bill;
+namespace FireflyIII\Events\Model\Subscription;
 
 use FireflyIII\Events\Event;
 use FireflyIII\Models\Bill;
 use Illuminate\Queue\SerializesModels;
 
-/**
- * Class WarnUserAboutBill.
- */
-class WarnUserAboutBill extends Event
+class SubscriptionNeedsExtensionOrRenewal extends Event
 {
     use SerializesModels;
 
-    public function __construct(public Bill $bill, public string $field, public int $diff) {}
+    public function __construct(public Bill $subscription, public string $field, public int $diff) {}
 }

app/Events/Model/Subscription/SubscriptionsAreOverdueForPayment.php

@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
 /*
- * Updated.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * SubscriptionIsOverdueForPayment.php
+ * Copyright (c) 2026 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,19 +18,18 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
+namespace FireflyIII\Events\Model\Subscription;
 
-namespace FireflyIII\Events\Model\Account;
-
-use FireflyIII\Models\Account;
+use FireflyIII\Events\Event;
+use FireflyIII\User;
 use Illuminate\Queue\SerializesModels;
 
-class Updated
+class SubscriptionsAreOverdueForPayment extends Event
 {
     use SerializesModels;
 
-    public function __construct(public Account $account) {}
+    public function __construct(public User $user, public array $overdue) {}
 }

app/Jobs/WarnAboutBills.php

@@ -25,8 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Jobs;
 
 use Carbon\Carbon;
-use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
 use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
+use FireflyIII\Events\Model\Subscription\SubscriptionNeedsExtensionOrRenewal;
 use FireflyIII\Models\Bill;
 use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;
@@ -143,7 +143,7 @@ class WarnAboutBills implements ShouldQueue
     {
         $diff = $this->getDiff($bill, $field);
         Log::debug('Will now send warning!');
-        event(new WarnUserAboutBill($bill, $field, $diff));
+        event(new SubscriptionNeedsExtensionOrRenewal($bill, $field, $diff));
     }
 
     public function setDate(Carbon $date): void

app/Listeners/Model/Subscription/NotifiesAboutExtensionOrRenewal.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * NotifiesAboutExtensionOrRenewal.php
+ * Copyright (c) 2026 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Listeners\Model\Subscription;
+
+use Exception;
+use FireflyIII\Events\Model\Subscription\SubscriptionNeedsExtensionOrRenewal;
+use FireflyIII\Notifications\User\BillReminder;
+use FireflyIII\Support\Facades\Preferences;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Notification;
+
+class NotifiesAboutExtensionOrRenewal implements ShouldQueue
+{
+    public function handle(SubscriptionNeedsExtensionOrRenewal $event): void
+    {
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        $subscription = $event->subscription;
+
+        /** @var bool $preference */
+        $preference   = Preferences::getForUser($subscription->user, 'notification_bill_reminder', true)->data;
+
+        if (true === $preference) {
+            Log::debug('Subscription reminder is true!');
+
+            try {
+                Notification::send($subscription->user, new BillReminder($subscription, $event->field, $event->diff));
+            } catch (Exception $e) {
+                $message = $e->getMessage();
+                if (str_contains($message, 'Bcc')) {
+                    Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+
+                    return;
+                }
+                if (str_contains($message, 'RFC 2822')) {
+                    Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+
+                    return;
+                }
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
+            }
+
+            return;
+        }
+        Log::debug('User has disabled subscription reminders.');
+    }
+}

app/Listeners/Model/Subscription/NotifiesAboutOverdueSubscriptions.php

@@ -1,8 +1,9 @@
 <?php
 
+declare(strict_types=1);
 /*
- * BillEventHandler.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * NotifiesAboutOverdueSubscription.php
+ * Copyright (c) 2026 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -20,35 +21,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
-namespace FireflyIII\Handlers\Events;
+namespace FireflyIII\Listeners\Model\Subscription;
 
 use Exception;
-use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
-use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
+use FireflyIII\Events\Model\Subscription\SubscriptionsAreOverdueForPayment;
 use FireflyIII\Models\Bill;
-use FireflyIII\Notifications\User\BillReminder;
 use FireflyIII\Notifications\User\SubscriptionsOverdueReminder;
 use FireflyIII\Support\Facades\Preferences;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 
-use function Safe\json_encode;
-
-/**
- * Class BillEventHandler
- */
-class BillEventHandler
+class NotifiesAboutOverdueSubscriptions implements ShouldQueue
 {
-    public function warnAboutOverdueSubscriptions(WarnUserAboutOverdueSubscriptions $event): void
+    public function handle(SubscriptionsAreOverdueForPayment $event): void
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
         // make sure user does not get the warning twice.
         $overdue          = $event->overdue;
         $user             = $event->user;
         $toBeWarned       = [];
-        Log::debug(sprintf('%d bills to warn about.', count($overdue)));
+        Log::debug(sprintf('%d subscriptions to warn about.', count($overdue)));
         foreach ($overdue as $item) {
             /** @var Bill $bill */
             $bill         = $item['bill'];
@@ -62,12 +55,12 @@ class BillEventHandler
             $toBeWarned[] = $item;
         }
         unset($bill);
-        Log::debug(sprintf('Now %d bills to warn about.', count($toBeWarned)));
+        Log::debug(sprintf('Now %d subscription(s) to warn about.', count($toBeWarned)));
 
         /** @var bool $sendNotification */
         $sendNotification = Preferences::getForUser($user, 'notification_bill_reminder', true)->data;
         if (false === $sendNotification) {
-            Log::debug('User has disabled bill reminders.');
+            Log::debug('User has disabled subscription reminders.');
 
             return;
         }
@@ -105,39 +98,4 @@ class BillEventHandler
 
 
     }
-
-    public function warnAboutBill(WarnUserAboutBill $event): void
-    {
-        Log::debug(sprintf('Now in %s', __METHOD__));
-
-        $bill       = $event->bill;
-
-        /** @var bool $preference */
-        $preference = Preferences::getForUser($bill->user, 'notification_bill_reminder', true)->data;
-
-        if (true === $preference) {
-            Log::debug('Bill reminder is true!');
-
-            try {
-                Notification::send($bill->user, new BillReminder($bill, $event->field, $event->diff));
-            } catch (Exception $e) {
-                $message = $e->getMessage();
-                if (str_contains($message, 'Bcc')) {
-                    Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
-
-                    return;
-                }
-                if (str_contains($message, 'RFC 2822')) {
-                    Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
-
-                    return;
-                }
-                Log::error($e->getMessage());
-                Log::error($e->getTraceAsString());
-            }
-
-            return;
-        }
-        Log::debug('User has disabled bill reminders.');
-    }
 }

app/Providers/EventServiceProvider.php

@@ -27,8 +27,6 @@ use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\Admin\InvitationCreated;
 use FireflyIII\Events\DestroyedTransactionGroup;
 use FireflyIII\Events\DetectedNewIPAddress;
-use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
-use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
 use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
 use FireflyIII\Events\Model\PiggyBank\ChangedName;
 use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray;
@@ -73,145 +71,145 @@ class EventServiceProvider extends ServiceProvider
     protected $listen
         = [
             // is a User related event.
-            RegisteredUser::class                    => [
+            RegisteredUser::class                  => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
                 'FireflyIII\Handlers\Events\UserEventHandler@sendAdminRegistrationNotification',
                 'FireflyIII\Handlers\Events\UserEventHandler@attachUserRole',
                 'FireflyIII\Handlers\Events\UserEventHandler@createGroupMembership',
                 'FireflyIII\Handlers\Events\UserEventHandler@createExchangeRates',
             ],
-            UserAttemptedLogin::class                => [
+            UserAttemptedLogin::class              => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendLoginAttemptNotification',
             ],
             // is a User related event.
-            Login::class                             => [
+            Login::class                           => [
                 'FireflyIII\Handlers\Events\UserEventHandler@checkSingleUserIsAdmin',
                 'FireflyIII\Handlers\Events\UserEventHandler@demoUserBackToEnglish',
             ],
-            ActuallyLoggedIn::class                  => [
+            ActuallyLoggedIn::class                => [
                 'FireflyIII\Handlers\Events\UserEventHandler@storeUserIPAddress',
             ],
-            DetectedNewIPAddress::class              => [
+            DetectedNewIPAddress::class            => [
                 'FireflyIII\Handlers\Events\UserEventHandler@notifyNewIPAddress',
             ],
-            RequestedVersionCheckStatus::class       => [
+            RequestedVersionCheckStatus::class     => [
                 'FireflyIII\Handlers\Events\VersionCheckEventHandler@checkForUpdates',
             ],
-            RequestedReportOnJournals::class         => [
+            RequestedReportOnJournals::class       => [
                 'FireflyIII\Handlers\Events\AutomationHandler@reportJournals',
             ],
 
             // is a User related event.
-            RequestedNewPassword::class              => [
+            RequestedNewPassword::class            => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendNewPassword',
             ],
-            UserTestNotificationChannel::class       => [
+            UserTestNotificationChannel::class     => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendTestNotification',
             ],
             // is a User related event.
-            UserChangedEmail::class                  => [
+            UserChangedEmail::class                => [
                 'FireflyIII\Handlers\Events\UserEventHandler@sendEmailChangeConfirmMail',
                 'FireflyIII\Handlers\Events\UserEventHandler@sendEmailChangeUndoMail',
             ],
             // admin related
-            OwnerTestNotificationChannel::class      => [
+            OwnerTestNotificationChannel::class    => [
                 'FireflyIII\Handlers\Events\AdminEventHandler@sendTestNotification',
             ],
-            NewVersionAvailable::class               => [
+            NewVersionAvailable::class             => [
                 'FireflyIII\Handlers\Events\AdminEventHandler@sendNewVersion',
             ],
-            InvitationCreated::class                 => [
+            InvitationCreated::class               => [
                 'FireflyIII\Handlers\Events\AdminEventHandler@sendInvitationNotification',
                 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationInvite',
             ],
-            UnknownUserAttemptedLogin::class         => [
+            UnknownUserAttemptedLogin::class       => [
                 'FireflyIII\Handlers\Events\AdminEventHandler@sendLoginAttemptNotification',
             ],
 
             // is a Transaction Journal related event.
-            StoredTransactionGroup::class            => [
+            StoredTransactionGroup::class          => [
                 'FireflyIII\Handlers\Events\StoredGroupEventHandler@runAllHandlers',
             ],
-            TriggeredStoredTransactionGroup::class   => [
+            TriggeredStoredTransactionGroup::class => [
                 'FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerRulesManually',
             ],
             // is a Transaction Journal related event.
-            UpdatedTransactionGroup::class           => [
+            UpdatedTransactionGroup::class         => [
                 'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@runAllHandlers',
             ],
-            DestroyedTransactionGroup::class         => [
+            DestroyedTransactionGroup::class       => [
                 'FireflyIII\Handlers\Events\DestroyedGroupEventHandler@runAllHandlers',
             ],
             // API related events:
-            AccessTokenCreated::class                => [
+            AccessTokenCreated::class              => [
                 'FireflyIII\Handlers\Events\APIEventHandler@accessTokenCreated',
             ],
 
             // Webhook related event:
-            RequestedSendWebhookMessages::class      => [
+            RequestedSendWebhookMessages::class    => [
                 'FireflyIII\Handlers\Events\WebhookEventHandler@sendWebhookMessages',
             ],
 
             // account related events:
-            StoredAccount::class                     => [
+            StoredAccount::class                   => [
                 'FireflyIII\Handlers\Events\StoredAccountEventHandler@recalculateCredit',
             ],
-            UpdatedAccount::class                    => [
+            UpdatedAccount::class                  => [
                 'FireflyIII\Handlers\Events\UpdatedAccountEventHandler@recalculateCredit',
             ],
 
-            // bill related events:
-            WarnUserAboutBill::class                 => [
-                'FireflyIII\Handlers\Events\BillEventHandler@warnAboutBill',
-            ],
-            WarnUserAboutOverdueSubscriptions::class => [
-                'FireflyIII\Handlers\Events\BillEventHandler@warnAboutOverdueSubscriptions',
-            ],
+            // subscription related events:
+            //            SubscriptionNeedsExtensionOrRenewal::class                 => [
+            //                'FireflyIII\Handlers\Events\BillEventHandler@warnAboutBill',
+            //            ],
+            //            WarnUserAboutOverdueSubscriptions::class => [
+            //                'FireflyIII\Handlers\Events\BillEventHandler@warnAboutOverdueSubscriptions',
+            //            ],
 
             // audit log events:
-            TriggeredAuditLog::class                 => [
+            TriggeredAuditLog::class               => [
                 'FireflyIII\Handlers\Events\AuditEventHandler@storeAuditEvent',
             ],
             // piggy bank related events:
-            ChangedAmount::class                     => [
+            ChangedAmount::class                   => [
                 'FireflyIII\Handlers\Events\Model\PiggyBankEventHandler@changePiggyAmount',
             ],
-            ChangedName::class                       => [
+            ChangedName::class                     => [
                 'FireflyIII\Handlers\Events\Model\PiggyBankEventHandler@changedPiggyBankName',
             ],
 
             // rule actions
-            RuleActionFailedOnArray::class           => [
+            RuleActionFailedOnArray::class         => [
                 'FireflyIII\Handlers\Events\Model\RuleHandler@ruleActionFailedOnArray',
             ],
-            RuleActionFailedOnObject::class          => [
+            RuleActionFailedOnObject::class        => [
                 'FireflyIII\Handlers\Events\Model\RuleHandler@ruleActionFailedOnObject',
             ],
 
             // security related
-            EnabledMFA::class                        => [
+            EnabledMFA::class                      => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendMFAEnabledMail',
             ],
-            DisabledMFA::class                       => [
+            DisabledMFA::class                     => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendMFADisabledMail',
             ],
-            MFANewBackupCodes::class                 => [
+            MFANewBackupCodes::class               => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendNewMFABackupCodesMail',
             ],
-            MFAUsedBackupCode::class                 => [
+            MFAUsedBackupCode::class               => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendUsedBackupCodeMail',
             ],
-            MFABackupFewLeft::class                  => [
+            MFABackupFewLeft::class                => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendBackupFewLeftMail',
             ],
-            MFABackupNoLeft::class                   => [
+            MFABackupNoLeft::class                 => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendBackupNoLeftMail',
             ],
-            MFAManyFailedAttempts::class             => [
+            MFAManyFailedAttempts::class           => [
                 'FireflyIII\Handlers\Events\Security\MFAHandler@sendMFAFailedAttemptsMail',
             ],
             // preferences
-            UserGroupChangedPrimaryCurrency::class   => [
+            UserGroupChangedPrimaryCurrency::class => [
                 'FireflyIII\Handlers\Events\PreferencesEventHandler@resetPrimaryCurrencyAmounts',
             ],
         ];

app/Support/Models/AccountBalanceCalculator.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
@@ -97,10 +98,9 @@ class AccountBalanceCalculator
 
             return '0';
         }
-        Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));
         $query   = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->whereNull('transactions.deleted_at')
-            ->where('transaction_journals.transaction_currency_id', $currencyId)
+            ->where('transactions.transaction_currency_id', $currencyId)
             ->whereNull('transaction_journals.deleted_at')
             // this order is the same as GroupCollector
             ->orderBy('transaction_journals.date', 'DESC')
@@ -110,21 +110,32 @@ class AccountBalanceCalculator
             ->orderBy('transactions.amount', 'DESC')
             ->where('transactions.account_id', $accountId)
         ;
-        $notBefore->startOfDay();
         $query->where('transaction_journals.date', '<', $notBefore);
 
         $first   = $query->first(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount', 'transactions.balance_after']);
+
+        if (null === $first) {
+            Log::debug(sprintf('Found no transactions for currency #%d and account #%d, return 0.', $currencyId, $accountId));
+
+            return '0';
+        }
+
+
         $balance = (string)($first->balance_after ?? '0');
-        Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d', $balance, $first->id ?? 0));
+        Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d on moment %s', Steam::bcround($balance, 2), $first->id ?? 0, $notBefore->format('Y-m-d H:i:s')));
 
         return $balance;
     }
 
     private function optimizedCalculation(Collection $accounts, ?Carbon $notBefore = null): void
     {
-        Log::debug('start of optimizedCalculation');
+        if ($notBefore instanceof Carbon) {
+            $notBefore->startOfDay();
+        }
+
+        Log::debug(sprintf('start of optimizedCalculation with date "%s"', $notBefore?->format('Y-m-d H:i:s')));
         if ($accounts->count() > 0) {
-            Log::debug(sprintf('Limited to %d account(s)', $accounts->count()));
+            Log::debug(sprintf('Limited to %d account(s): %s', $accounts->count(), implode(', ', $accounts->pluck('id')->toArray())));
         }
         // collect all transactions and the change they make.
         $balances = [];
@@ -143,18 +154,18 @@ class AccountBalanceCalculator
             $query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray());
         }
         if ($notBefore instanceof Carbon) {
-            $notBefore->startOfDay();
             $query->where('transaction_journals.date', '>=', $notBefore);
         }
 
         $set      = $query->get(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount']);
-        Log::debug(sprintf('Counted %d transaction(s)', $set->count()));
+        Log::debug(sprintf('Found %d transaction(s)', $set->count()));
 
         // the balance value is an array.
         // first entry is the balance, second is the date.
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
+            Log::debug(sprintf('Processing transaction #%d with currency #%d and amount %s', $entry->id, $entry->transaction_currency_id, Steam::bcround($entry->amount)));
             // start with empty array:
             $balances[$entry->account_id]                                  ??= [];
             $balances[$entry->account_id][$entry->transaction_currency_id] ??= [$this->getLatestBalance($entry->account_id, $entry->transaction_currency_id, $notBefore), null];
@@ -162,6 +173,9 @@ class AccountBalanceCalculator
             // before and after are easy:
             $before                                                        = $balances[$entry->account_id][$entry->transaction_currency_id][0];
             $after                                                         = bcadd($before, (string)$entry->amount);
+
+            Log::debug(sprintf('Before:%s, after:%s', Steam::bcround($before, 2), Steam::bcround($after, 2)));
+
             if (true === $entry->balance_dirty || $accounts->count() > 0) {
                 // update the transaction:
                 $entry->balance_before = $before;

app/Support/System/OAuthKeys.php

@@ -24,12 +24,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\System;
 
-use Illuminate\Support\Facades\Log;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Log;
 use Laravel\Passport\Console\KeysCommand;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -48,16 +48,27 @@ class OAuthKeys
 
     public static function generateKeys(): void
     {
+        Log::debug('Will now run generateKeys()');
         Artisan::registerCommand(new KeysCommand());
         Artisan::call('firefly-iii:laravel-passport-keys');
+        Log::debug('Done with generateKeys()');
     }
 
     public static function hasKeyFiles(): bool
     {
-        $private = storage_path('oauth-private.key');
-        $public  = storage_path('oauth-public.key');
+        Log::debug('hasKeyFiles()');
+        $private       = storage_path('oauth-private.key');
+        $public        = storage_path('oauth-public.key');
+        $privateExists = file_exists($private);
+        $publicExists  = file_exists($public);
 
-        return file_exists($private) && file_exists($public);
+        Log::debug(sprintf('Private key file at "%s" exists? %s', $private, var_export($privateExists, true)));
+        Log::debug(sprintf('Public key file at "%s" exists ? %s', $public, var_export($publicExists, true)));
+
+        $result        = file_exists($private) && file_exists($public);
+        Log::debug(sprintf('Method will return %s', var_export($result, true)));
+
+        return $result;
     }
 
     public static function keysInDatabase(): bool
@@ -65,17 +76,36 @@ class OAuthKeys
         $privateKey = '';
         $publicKey  = '';
         // better check if keys are in the database:
-        if (FireflyConfig::has(self::PRIVATE_KEY) && FireflyConfig::has(self::PUBLIC_KEY)) {
+        $hasPrivate = FireflyConfig::has(self::PRIVATE_KEY);
+        $hasPublic  = FireflyConfig::has(self::PUBLIC_KEY);
+
+        Log::debug(sprintf('keysInDatabase: hasPrivate:%s, hasPublic:%s', var_export($hasPrivate, true), var_export($hasPublic, true)));
+
+        if ($hasPrivate && $hasPublic) {
             try {
-                $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
-                $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
+                $privateKey = trim((string)FireflyConfig::get(self::PRIVATE_KEY)?->data);
+                $publicKey  = trim((string)FireflyConfig::get(self::PUBLIC_KEY)?->data);
             } catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) {
                 Log::error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage()));
                 Log::error($e->getTraceAsString());
             }
         }
+        if ('' === $privateKey) {
+            Log::warning('Private key in DB is unexpectedly an empty string.');
+        }
+        if ('' === $publicKey) {
+            Log::warning('Public key in DB is unexpectedly an empty string.');
+        }
+        if ('' !== $privateKey) {
+            Log::debug(sprintf('SHA2 hash of private key in DB: %s', hash('sha256', $privateKey)));
+        }
+        if ('' !== $publicKey) {
+            Log::debug(sprintf('SHA2 hash of public key in DB : %s', hash('sha256', $publicKey)));
+        }
+        $return     = '' !== $privateKey && '' !== $publicKey;
+        Log::debug(sprintf('keysInDatabase will return %s', var_export($return, true)));
 
-        return '' !== $privateKey && '' !== $publicKey;
+        return $return;
     }
 
     /**
@@ -86,12 +116,20 @@ class OAuthKeys
      */
     public static function restoreKeysFromDB(): bool
     {
+        Log::debug('restoreKeysFromDB()');
         $privateKey = (string)FireflyConfig::get(self::PRIVATE_KEY)?->data;
         $publicKey  = (string)FireflyConfig::get(self::PUBLIC_KEY)?->data;
 
+        if ('' === $privateKey) {
+            Log::warning('Private key is not in the database.');
+        }
+        if ('' === $publicKey) {
+            Log::warning('Public key is not in the database.');
+        }
+
         try {
-            $privateContent = Crypt::decrypt($privateKey);
-            $publicContent  = Crypt::decrypt($publicKey);
+            $privateContent = trim(Crypt::decrypt($privateKey));
+            $publicContent  = trim(Crypt::decrypt($publicKey));
         } catch (DecryptException $e) {
             Log::error('Could not decrypt pub/private keypair.');
             Log::error($e->getMessage());
@@ -99,6 +137,7 @@ class OAuthKeys
             // delete config vars from DB:
             FireflyConfig::delete(self::PRIVATE_KEY);
             FireflyConfig::delete(self::PUBLIC_KEY);
+            Log::debug('Done with generateKeysFromDB(), return FALSE');
 
             return false;
         }
@@ -107,15 +146,24 @@ class OAuthKeys
         file_put_contents($private, $privateContent);
         file_put_contents($public, $publicContent);
 
+        Log::debug(sprintf('Will store private key with hash "%s" in file "%s"', hash('sha256', $privateContent), $private));
+        Log::debug(sprintf('Will store public key with hash "%s" in file "%s"', hash('sha256', $publicContent), $public));
+        Log::debug('Done with generateKeysFromDB()');
+
         return true;
     }
 
     public static function storeKeysInDB(): void
     {
-        $private = storage_path('oauth-private.key');
-        $public  = storage_path('oauth-public.key');
-        FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt(file_get_contents($private)));
-        FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt(file_get_contents($public)));
+        $private        = storage_path('oauth-private.key');
+        $public         = storage_path('oauth-public.key');
+        $privateContent = file_get_contents($private);
+        $publicContent  = file_get_contents($public);
+        FireflyConfig::set(self::PRIVATE_KEY, Crypt::encrypt($privateContent));
+        FireflyConfig::set(self::PUBLIC_KEY, Crypt::encrypt($publicContent));
+
+        Log::debug(sprintf('Will store the content of file "%s" as "%s" in the database (hash: %s)', $private, self::PRIVATE_KEY, hash('sha256', $privateContent)));
+        Log::debug(sprintf('Will store the content of file "%s" as "%s" in the database (hash: %s)', $public, self::PUBLIC_KEY, hash('sha256', $publicContent)));
     }
 
     public static function verifyKeysRoutine(): void

changelog.md

@@ -12,7 +12,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Discussion 11431](https://github.com/orgs/firefly-iii/discussions/11431) (Settings don't get saved) started by @PVTejas
 - [Issue 11473](https://github.com/firefly-iii/firefly-iii/issues/11473) (Searching transaction with two tags_contains returns results matching only one of those) reported by @F-DXI
 - [Issue 11474](https://github.com/firefly-iii/firefly-iii/issues/11474) (Potential error in sub total computation for group in subscription) reported by @ma-clog
-- [Discussion 11475](https://github.com/orgs/firefly-iii/discussions/11475) (Potential error in sub total computation for group in subscription) started by @ma-clog
 - [Issue 11479](https://github.com/firefly-iii/firefly-iii/issues/11479) (Editing a user profile as admin without setting a new password causes a 500 Internal server error) reported by @watertrainer
 - [Issue 11501](https://github.com/firefly-iii/firefly-iii/issues/11501) (Schema of /api/v1/available-budgets different from spec) reported by @RadCod3
 - [Issue 11502](https://github.com/firefly-iii/firefly-iii/issues/11502) (Visual bug - Transaction notes' markdown doesn't properly render code blocks in dark mode) reported by @AyluinReymaer

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-01-17',
-    'build_time'                           => 1768630588,
+    'version'                              => 'develop/2026-01-18',
+    'build_time'                           => 1768729886,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue

@@ -121,8 +121,10 @@ export default {
             let srcType = this.source.type ? this.source.type.toLowerCase() : 'invalid';
             let tType = this.transactionType ? this.transactionType.toLowerCase() : 'invalid';
             let liabilities = ['loan', 'debt', 'mortgage'];
+            let asset = ['asset account'];
             let sourceIsLiability = liabilities.indexOf(srcType) !== -1;
             let destIsLiability = liabilities.indexOf(destType) !== -1;
+            let destIsAsset =asset.indexOf(destType) !== -1;
 
 
             // console.log(srcType + ' (source) is a liability: ' + sourceIsLiability);
@@ -131,18 +133,15 @@ export default {
             if (tType === 'transfer' || destIsLiability || sourceIsLiability) {
                 console.log('Source or dest is a liability.')
                 console.log('Source is liability OR dest is liability, OR transfer. Lock list on currency of destination.');
+                console.log(this.destination.type);
                 // console.log('Length of currencies is ' + this.currencies.length);
                 // console.log(this.currencies);
                 this.liability = true;
                 // lock dropdown list on currencyID of destination UNLESS dest is not liab
                 for (const key in this.currencies) {
                     if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-                        if (
-                            parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id) || !destIsLiability
-                        ) {
-                            console.log('Enable currency!!');
-                            console.log(this.currencies[key]);
-                            // console.log(this.destination);
+                        if (parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id) || (!destIsLiability && 'transfer' !== tType)) {
+                            console.log('Enable currency: ' + this.currencies[key].attributes.code + '.');
                             this.enabledCurrencies.push(this.currencies[key]);
                         }
                     }

resources/views/list/groups.twig

@@ -314,7 +314,12 @@
                             {% if account.id == transaction.source_account_id %}
                                 <span title="Transfer, source">{{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             {% else %}
-                                <span title="Transfer, dest">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                {% if null == transaction.foreign_currency_id %}
+                                    <span title="Transfer, dest, normal currency">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                {% endif %}
+                                {% if null != transaction.foreign_currency_id %}
+                                    <span title="Transfer, dest, foreign currency">{{ formatAmountBySymbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
+                                {% endif %}
                             {% endif %}
                         {% else %}
                             &nbsp;