Merge pull request #10215 from firefly-iii/release-1745810633

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-04-28
2025-10-17 09:51:40 +00:00 · 2025-04-28 05:24:02 +02:00 · 2025-04-28 05:23:53 +02:00 · 2025-04-27 10:32:28 +02:00 · 2025-04-27 10:32:21 +02:00 · 2025-04-26 17:33:56 +02:00
41 changed files with 580 additions and 321 deletions
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

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

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

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

        return array_values($return);
--- a/app/Console/Commands/System/RecalculatesRunningBalance.php
+++ b/app/Console/Commands/System/RecalculatesRunningBalance.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * RecalculatesRunningBalance.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Models\AccountBalanceCalculator;
+use Illuminate\Console\Command;
+
+class RecalculatesRunningBalance extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:refresh-running-balance {--F|force : Force the execution of this command.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refreshes all running balances. May take a long time to run if forced.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        if (true === config('firefly.feature_flags.running_balance_column')) {
+            $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
+            $this->correctBalanceAmounts($this->option('force'));
+            $this->friendlyInfo('Done recalculating account balances.');
+
+            return 0;
+        }
+        $this->friendlyWarning('This command has been disabled.');
+    }
+
+    private function correctBalanceAmounts(bool $forced): void
+    {
+        AccountBalanceCalculator::recalculateAll($forced);
+    }
+}
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@@ -23,6 +23,7 @@ declare(strict_types=1);

 namespace FireflyIII\Factory;

+use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionCurrency;
@@ -237,20 +238,46 @@ class PiggyBankFactory
            }
        }

-
        /** @var array $info */
        foreach ($accounts as $info) {
            $account = $this->accountRepository->find((int) ($info['account_id'] ?? 0));
            if (null === $account) {
+                Log::debug(sprintf('Account #%d not found, skipping.', (int) ($info['account_id'] ?? 0)));
+
                continue;
            }
            if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {
+                // an amount is set, first check out if there is a difference with the previous amount.
+                $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
+                $diff                     = bcsub($info['current_amount'], $previous);
+
+                // create event for difference.
+                if (0 !== bccomp($diff, '0')) {
+                    Log::debug(sprintf('[a] Will save event for difference %s (previous value was %s)', $diff, $previous));
+                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                }
+
                $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
                Log::debug(sprintf('[a] Will link account #%d with amount %s', $account->id, $info['current_amount']));
            }
            if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {
+                // an amount is set, first check out if there is a difference with the previous amount.
+                $previous                 = $toBeLinked[$account->id]['current_amount'] ?? '0';
+                $diff                     = bcsub('0', $previous);
+
+                // create event for difference.
+                if (0 !== bccomp($diff, '0')) {
+                    Log::debug(sprintf('[b] Will save event for difference %s (previous value was %s)', $diff, $previous));
+                    event(new ChangedAmount($piggyBank, $diff, null, null));
+                }
+
+                // no amount set, use previous amount or go to ZERO.
                $toBeLinked[$account->id] = ['current_amount' => $toBeLinked[$account->id]['current_amount'] ?? '0'];
                Log::debug(sprintf('[b] Will link account #%d with amount %s', $account->id, $toBeLinked[$account->id]['current_amount'] ?? '0'));
+
+                // create event:
+                Log::debug('linkToAccountIds: Trigger change for positive amount [b].');
+                event(new ChangedAmount($piggyBank, $toBeLinked[$account->id]['current_amount'], null, null));
            }
            if (!array_key_exists('current_amount', $info)) {
                $toBeLinked[$account->id] ??= [];
@@ -258,6 +285,11 @@ class PiggyBankFactory
            }
        }
        Log::debug(sprintf('Link information: %s', json_encode($toBeLinked)));
-        $piggyBank->accounts()->sync($toBeLinked);
+        if (0 !== count($toBeLinked)) {
+            $piggyBank->accounts()->sync($toBeLinked);
+        }
+        if (0 === count($toBeLinked)) {
+            Log::warning('No accounts to link to piggy bank, will not change whatever is there now.');
+        }
    }
 }
--- a/app/Handlers/Observer/PiggyBankEventObserver.php
+++ b/app/Handlers/Observer/PiggyBankEventObserver.php
@@ -45,7 +45,13 @@ class PiggyBankEventObserver

    private function updateNativeAmount(PiggyBankEvent $event): void
    {
-        if (!Amount::convertToNative($event->piggyBank->accounts()->first()->user)) {
+        $user                 = $event->piggyBank->accounts()->first()?->user;
+        if (null === $user) {
+            Log::warning('Piggy bank seems to have no accounts. Break.');
+
+            return;
+        }
+        if (!Amount::convertToNative($user)) {
            return;
        }
        $userCurrency         = app('amount')->getNativeCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
--- a/app/Helpers/Collector/Extensions/CollectorProperties.php
+++ b/app/Helpers/Collector/Extensions/CollectorProperties.php
@@ -55,6 +55,7 @@ trait CollectorProperties
    private HasMany $query;
    private ?int    $startRow;
    private array   $stringFields;
+    private array   $booleanFields;
    /*
     * This array is used to collect ALL tags the user may search for (using 'setTags').
     * This way the user can call 'setTags' multiple times and get a joined result.
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -82,6 +82,7 @@ class GroupCollector implements GroupCollectorInterface
        $this->hasJoinedAttTables   = false;
        $this->expandGroupSearch    = false;
        $this->hasJoinedMetaTables  = false;
+        $this->booleanFields        = ['balance_dirty'];
        $this->integerFields        = [
            'transaction_group_id',
            'user_id',
@@ -100,7 +101,7 @@ class GroupCollector implements GroupCollectorInterface
            'category_id',
            'budget_id',
        ];
-        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount'];
+        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount', 'source_balance_after', 'destination_balance_after'];
        $this->total                = 0;
        $this->fields               = [
            // group
@@ -131,6 +132,8 @@ class GroupCollector implements GroupCollectorInterface

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

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

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

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

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

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

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

--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -177,7 +177,7 @@ class IndexController extends Controller
            $array['end_date']        = $entry->end_date;

            // spent in period:
-            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency);
+            $spentArr                 = $this->opsRepository->sumExpenses($entry->start_date, $entry->end_date, null, null, $entry->transactionCurrency, false);
            $array['spent']           = $spentArr[$entry->transaction_currency_id]['sum'] ?? '0';
            $array['native_spent']    = $this->convertToNative && $entry->transaction_currency_id !== $this->defaultCurrency->id ? $converter->convert($entry->transactionCurrency, $this->defaultCurrency, $entry->start_date, $array['spent']) : null;
            // budgeted in period:
@@ -235,7 +235,7 @@ class IndexController extends Controller

            /** @var TransactionCurrency $currency */
            foreach ($currencies as $currency) {
-                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency);
+                $spentArr = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$current]), $currency, false);
                if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                    $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
                    $array['spent'][$currency->id]['currency_id']             = $currency->id;
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -175,9 +175,10 @@ class ShowController extends Controller
            throw new FireflyException('This budget limit is not part of this budget.');
        }

-        $page        = (int) $request->get('page');
-        $pageSize    = (int) app('preferences')->get('listPageSize', 50)->data;
-        $subTitle    = trans(
+        $currencySymbol = $budgetLimit->transactionCurrency->symbol;
+        $page           = (int) $request->get('page');
+        $pageSize       = (int) app('preferences')->get('listPageSize', 50)->data;
+        $subTitle       = trans(
            'firefly.budget_in_period',
            [
                'name'     => $budget->name,
@@ -186,23 +187,26 @@ class ShowController extends Controller
                'currency' => $budgetLimit->transactionCurrency->name,
            ]
        );
+        if ($this->convertToNative) {
+            $currencySymbol = $this->defaultCurrency->symbol;
+        }

        // collector:
        /** @var GroupCollectorInterface $collector */
-        $collector   = app(GroupCollectorInterface::class);
+        $collector      = app(GroupCollectorInterface::class);

        $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->withAccountInformation()
            ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation()->withCategoryInformation()
        ;
-        $groups      = $collector->getPaginatedGroups();
+        $groups         = $collector->getPaginatedGroups();
        $groups->setPath(route('budgets.show.limit', [$budget->id, $budgetLimit->id]));

        /** @var Carbon $start */
-        $start       = session('first', today(config('app.timezone'))->startOfYear());
-        $end         = today(config('app.timezone'));
-        $attachments = $this->repository->getAttachments($budget);
-        $limits      = $this->getLimits($budget, $start, $end);
+        $start          = session('first', today(config('app.timezone'))->startOfYear());
+        $end            = today(config('app.timezone'));
+        $attachments    = $this->repository->getAttachments($budget);
+        $limits         = $this->getLimits($budget, $start, $end);

-        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle', 'currencySymbol'));
    }
 }
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -82,13 +82,16 @@ class AccountController extends Controller
     */
    public function expenseAccounts(): JsonResponse
    {
-        Log::debug('RevenueAccounts');
+        Log::debug('ExpenseAccounts');

        /** @var Carbon $start */
        $start         = clone session('start', today(config('app.timezone'))->startOfMonth());

        /** @var Carbon $end */
        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+        $start->startOfDay();
+        $end->endOfDay();
+
        $cache         = new CacheProperties();
        $cache->addProperty($start);
        $cache->addProperty($end);
@@ -97,7 +100,6 @@ class AccountController extends Controller
        if ($cache->has()) {
            return response()->json($cache->get());
        }
-        $start->subDay();

        // prep some vars:
        $currencies    = [];
@@ -557,6 +559,10 @@ class AccountController extends Controller

        /** @var Carbon $end */
        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
+
+        $start->startOfDay();
+        $end->endOfDay();
+
        $cache         = new CacheProperties();
        $cache->addProperty($start);
        $cache->addProperty($end);
@@ -565,7 +571,6 @@ class AccountController extends Controller
        if ($cache->has()) {
            return response()->json($cache->get());
        }
-        $start->subDay();

        // prep some vars:
        $currencies    = [];
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -172,13 +172,13 @@ class BudgetController extends Controller
        $budgetCollection                       = new Collection([$budget]);
        $currency                               = $budgetLimit->transactionCurrency;
        if ($this->convertToNative) {
-            $amount   = $budgetLimit->native_amount ?? '0';
+            $amount   = $budgetLimit->native_amount ?? $amount;
            $currency = $this->defaultCurrency;
        }

        while ($start <= $end) {
            $current          = clone $start;
-            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency);
+            $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency, $this->convertToNative);
            $spent            = $expenses[$currency->id]['sum'] ?? '0';
            $amount           = bcadd($amount, $spent);
            $format           = $start->isoFormat((string) trans('config.month_and_day_js', [], $locale));
@@ -191,6 +191,7 @@ class BudgetController extends Controller
        $data['datasets'][0]['currency_symbol'] = $currency->symbol;
        $data['datasets'][0]['currency_code']   = $currency->code;
        $cache->store($data);
+        // var_dump($data);exit;

        return response()->json($data);
    }
@@ -214,7 +215,7 @@ class BudgetController extends Controller
        if (null !== $budgetLimit) {
            $start = $budgetLimit->start_date;
            $end   = $budgetLimit->end_date;
-            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
        }
        $cache->addProperty($start);
        $cache->addProperty($end);
@@ -296,7 +297,7 @@ class BudgetController extends Controller
        if (null !== $budgetLimit) {
            $start = $budgetLimit->start_date;
            $end   = $budgetLimit->end_date;
-            $collector->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setNormalCurrency($budgetLimit->transactionCurrency);
        }
        $cache->addProperty($start);
        $cache->addProperty($end);
@@ -378,7 +379,7 @@ class BudgetController extends Controller
        if (null !== $budgetLimit) {
            $start = $budgetLimit->start_date;
            $end   = $budgetLimit->end_date;
-            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setCurrency($budgetLimit->transactionCurrency);
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date)->setNormalCurrency($budgetLimit->transactionCurrency);
        }
        $cache->addProperty($start);
        $cache->addProperty($end);
--- a/app/Http/Controllers/PiggyBank/EditController.php
+++ b/app/Http/Controllers/PiggyBank/EditController.php
@@ -78,13 +78,14 @@ class EditController extends Controller
        $startDate    = $piggyBank->start_date?->format('Y-m-d');

        $preFilled    = [
-            'name'          => $piggyBank->name,
-            'target_amount' => app('steam')->bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
-            'target_date'   => $targetDate,
-            'start_date'    => $startDate,
-            'accounts'      => [],
-            'object_group'  => null !== $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',
-            'notes'         => null === $note ? '' : $note->text,
+            'name'                    => $piggyBank->name,
+            'transaction_currency_id' => (int) $piggyBank->transaction_currency_id,
+            'target_amount'           => app('steam')->bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
+            'target_date'             => $targetDate,
+            'start_date'              => $startDate,
+            'accounts'                => [],
+            'object_group'            => null !== $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',
+            'notes'                   => null === $note ? '' : $note->text,
        ];
        foreach ($piggyBank->accounts as $account) {
            $preFilled['accounts'][] = $account->id;
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -135,7 +135,7 @@ class EditController extends Controller

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

        // put previous url in session if not redirect from store (not "return_to_edit").
        if (true !== session('rules.edit.fromUpdate')) {
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -32,11 +32,11 @@ use Symfony\Component\HttpFoundation\Request;
 class TrustProxies extends Middleware
 {
    // After...
-    protected $headers
-        = Request::HEADER_X_FORWARDED_FOR
+    protected $headers = Request::HEADER_X_FORWARDED_FOR
        | Request::HEADER_X_FORWARDED_HOST
        | Request::HEADER_X_FORWARDED_PORT
        | Request::HEADER_X_FORWARDED_PROTO
+        | Request::HEADER_X_FORWARDED_PREFIX
        | Request::HEADER_X_FORWARDED_AWS_ELB;

    /**
--- a/app/Http/Requests/PiggyBankUpdateRequest.php
+++ b/app/Http/Requests/PiggyBankUpdateRequest.php
@@ -49,12 +49,13 @@ class PiggyBankUpdateRequest extends FormRequest
    {
        $accounts = $this->get('accounts');
        $data     = [
-            'name'               => $this->convertString('name'),
-            'start_date'         => $this->getCarbonDate('start_date'),
-            'target_amount'      => trim($this->convertString('target_amount')),
-            'target_date'        => $this->getCarbonDate('target_date'),
-            'notes'              => $this->stringWithNewlines('notes'),
-            'object_group_title' => $this->convertString('object_group'),
+            'name'                    => $this->convertString('name'),
+            'start_date'              => $this->getCarbonDate('start_date'),
+            'target_amount'           => trim($this->convertString('target_amount')),
+            'target_date'             => $this->getCarbonDate('target_date'),
+            'transaction_currency_id' => $this->convertInteger('transaction_currency_id'),
+            'notes'                   => $this->stringWithNewlines('notes'),
+            'object_group_title'      => $this->convertString('object_group'),
        ];
        if (!is_array($accounts)) {
            $accounts = [];
@@ -75,15 +76,16 @@ class PiggyBankUpdateRequest extends FormRequest
        $piggy = $this->route()->parameter('piggyBank');

        return [
-            'name'          => sprintf('required|min:1|max:255|uniquePiggyBankForUser:%d', $piggy->id),
-            'accounts'      => 'required|array',
-            'accounts.*'    => 'required|belongsToUser:accounts',
-            'target_amount' => ['nullable', new IsValidPositiveAmount()],
-            'start_date'    => 'date',
-            'target_date'   => 'date|nullable',
-            'order'         => 'integer|max:32768|min:1',
-            'object_group'  => 'min:0|max:255',
-            'notes'         => 'min:1|max:32768|nullable',
+            'name'                    => sprintf('required|min:1|max:255|uniquePiggyBankForUser:%d', $piggy->id),
+            'accounts'                => 'required|array',
+            'accounts.*'              => 'required|belongsToUser:accounts',
+            'target_amount'           => ['nullable', new IsValidPositiveAmount()],
+            'start_date'              => 'date',
+            'transaction_currency_id' => 'exists:transaction_currencies,id',
+            'target_date'             => 'date|nullable',
+            'order'                   => 'integer|max:32768|min:1',
+            'object_group'            => 'min:0|max:255',
+            'notes'                   => 'min:1|max:32768|nullable',
        ];
    }

--- a/app/Repositories/Budget/OperationsRepository.php
+++ b/app/Repositories/Budget/OperationsRepository.php
@@ -201,9 +201,10 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
        Carbon               $end,
        ?Collection          $accounts = null,
        ?Collection          $budgets = null,
-        ?TransactionCurrency $currency = null
+        ?TransactionCurrency $currency = null,
+        bool                 $convertToNative = false
    ): array {
-        Log::debug(sprintf('Start of %s.', __METHOD__));
+        Log::debug(sprintf('Start of %s(date, date, array, array, "%s", "%s").', __METHOD__, $currency?->code, var_export($convertToNative, true)));
        // this collector excludes all transfers TO liabilities (which are also withdrawals)
        // because those expenses only become expenses once they move from the liability to the friend.
        // 2024-12-24 disable the exclusion for now.
@@ -235,10 +236,12 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
            $budgets = $this->getBudgets();
        }
        if (null !== $currency) {
-            Log::debug(sprintf('Limit to currency %s', $currency->code));
-            $collector->setCurrency($currency);
+            Log::debug(sprintf('Limit to normal currency %s', $currency->code));
+            $collector->setNormalCurrency($currency);
+        }
+        if ($budgets->count() > 0) {
+            $collector->setBudgets($budgets);
        }
-        $collector->setBudgets($budgets);
        $journals   = $collector->getExtractedJournals();

        // same but for transactions in the foreign currency:
@@ -246,6 +249,8 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
            Log::debug('STOP looking for transactions in the foreign currency.');
        }
        $summarizer = new TransactionSummarizer($this->user);
+        // 2025-04-21 overrule "convertToNative" because in this particular view, we never want to do this.
+        $summarizer->setConvertToNative($convertToNative);

        return $summarizer->groupByCurrencyId($journals, 'negative', false);
    }
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -31,6 +31,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
@@ -223,6 +224,8 @@ trait ModifiesPiggyBanks
        $factory       = new PiggyBankFactory();
        $factory->user = $this->user;

+        // the piggy bank currency is set or updated FIRST, if it exists.
+
        $factory->linkToAccountIds($piggyBank, $data['accounts'] ?? []);


@@ -280,6 +283,13 @@ trait ModifiesPiggyBanks
        if (array_key_exists('name', $data) && '' !== $data['name']) {
            $piggyBank->name = $data['name'];
        }
+        if (array_key_exists('transaction_currency_id', $data) && is_int($data['transaction_currency_id'])) {
+            $currency = TransactionCurrency::find($data['transaction_currency_id']);
+            if (null !== $currency) {
+                $piggyBank->transaction_currency_id = $currency->id;
+            }
+        }
+
        if (array_key_exists('target_amount', $data) && '' !== $data['target_amount']) {
            $piggyBank->target_amount = $data['target_amount'];
        }
--- a/app/Support/Export/ExportDataGenerator.php
+++ b/app/Support/Export/ExportDataGenerator.php
@@ -57,6 +57,7 @@ use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use League\Csv\CannotInsertRecord;
 use League\Csv\Exception;
 use League\Csv\Writer;
--- a/app/Support/Http/Controllers/AugumentData.php
+++ b/app/Support/Http/Controllers/AugumentData.php
@@ -38,6 +38,7 @@ use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;

 /**
 * Trait AugumentData
@@ -167,6 +168,8 @@ trait AugumentData
     */
    protected function getLimits(Budget $budget, Carbon $start, Carbon $end): Collection // get data + augment with info
    {
+        Log::debug('In getLimits');
+
        /** @var OperationsRepositoryInterface $opsRepository */
        $opsRepository    = app(OperationsRepositoryInterface::class);

@@ -195,24 +198,30 @@ trait AugumentData

        /** @var BudgetLimit $entry */
        foreach ($set as $entry) {
-            $currency     = $entry->transactionCurrency;
+            Log::debug(sprintf('Now at budget limit #%d', $entry->id));
+            $currency            = $entry->transactionCurrency;
            if ($this->convertToNative) {
                // the sumExpenses method already handles this.
                $currency = $this->defaultCurrency;
            }

            // clone because these objects change each other.
-            $currentStart = clone $entry->start_date;
-            $currentEnd   = null === $entry->end_date ? null : clone $entry->end_date;
+            $currentStart        = clone $entry->start_date;
+            $currentEnd          = null === $entry->end_date ? null : clone $entry->end_date;

            if (null === $currentEnd) {
                $currentEnd = clone $currentStart;
                $currentEnd->addMonth();
            }
+            // native amount.
+            $expenses            = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToNative);
+            $spent               = $expenses[$currency->id]['sum'] ?? '0';
+            $entry->native_spent = $spent;

-            $expenses     = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $currency);
-            $spent        = $expenses[$currency->id]['sum'] ?? '0';
-            $entry->spent = $spent;
+            // normal amount:
+            $expenses            = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, false);
+            $spent               = $expenses[$entry->transactionCurrency->id]['sum'] ?? '0';
+            $entry->spent        = $spent;

            $limits->push($entry);
        }
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -89,6 +89,7 @@ class AccountBalanceCalculator
        }

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

        // the balance value is an array.
        // first entry is the balance, second is the date.
--- a/app/Support/Report/Summarizer/TransactionSummarizer.php
+++ b/app/Support/Report/Summarizer/TransactionSummarizer.php
@@ -51,7 +51,7 @@ class TransactionSummarizer

    public function groupByCurrencyId(array $journals, string $method = 'negative', bool $includeForeign = true): array
    {
-        Log::debug(sprintf('Now in groupByCurrencyId(array, "%s")', $method));
+        Log::debug(sprintf('Now in groupByCurrencyId([%d journals], "%s")', count($journals), $method));
        $array = [];
        foreach ($journals as $journal) {
            $field                        = 'amount';
@@ -71,6 +71,7 @@ class TransactionSummarizer
            $foreignCurrencyDecimalPlaces = null;

            if ($this->convertToNative) {
+                Log::debug('convertToNative is true.');
                // if convert to native, use the native amount yes or no?
                $useNative  = $this->default->id !== (int) $journal['currency_id'];
                $useForeign = $this->default->id === (int) $journal['foreign_currency_id'];
@@ -94,6 +95,7 @@ class TransactionSummarizer
                }
            }
            if (!$this->convertToNative) {
+                Log::debug('convertToNative is false.');
                // use foreign amount?
                $foreignCurrencyId = (int) $journal['foreign_currency_id'];
                if (0 !== $foreignCurrencyId) {
@@ -224,4 +226,10 @@ class TransactionSummarizer

        return $array;
    }
+
+    public function setConvertToNative(bool $convertToNative): void
+    {
+        Log::debug(sprintf('Overrule convertToNative to become %s', var_export($convertToNative, true)));
+        $this->convertToNative = $convertToNative;
+    }
 }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.2.12 - 2025-04-21
+
+### Fixed
+
+- [Issue 9755](https://github.com/firefly-iii/firefly-iii/issues/9755) (Unable to create transactions with non-native currency accounts when "display amounts in native currency" is enabled) reported by @dicksonleong
+- [Issue 9867](https://github.com/firefly-iii/firefly-iii/issues/9867) (Transactions from Jan 31 being counted in February) reported by @edbingo
+- [Issue 9878](https://github.com/firefly-iii/firefly-iii/issues/9878) (Piggy bank currency - wrong setting displayed or setting not saved) reported by @dethegeek
+- [Issue 10068](https://github.com/firefly-iii/firefly-iii/issues/10068) (Export Data isn't exporting all transactions in the data) reported by @firsttiger
+- [Discussion 10162](https://github.com/orgs/firefly-iii/discussions/10162) (Reverse proxy and `X-Forwarded-Prefix` header) started by @frenchu
+
 ## 6.2.11 - 2025-04-21

 ### Added
--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.44.2",
+            "version": "v11.44.7",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4"
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
-                "reference": "f85216c82cbd38b66d67ebd20ea762cb3751a4b4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
+                "reference": "00bc6ac91a6d577bf051c18ddaa638c0d221e1c7",
                "shasum": ""
            },
            "require": {
@@ -2089,7 +2089,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-03-12T14:34:30+00:00"
+            "time": "2025-04-25T12:40:47+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2228,16 +2228,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.8",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c"
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
-                "reference": "ec1dd9ddb2ab370f79dfe724a101856e0963f43c",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
+                "reference": "4e4ced5023e9d8949214e0fb43d9f4bde79c7166",
                "shasum": ""
            },
            "require": {
@@ -2288,7 +2288,7 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2025-01-26T19:34:36+00:00"
+            "time": "2025-04-22T13:53:47+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@@ -10626,16 +10626,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.3.1",
+            "version": "v3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "58bee8be51daf12d78ed0a909be3b205607d2f27"
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/58bee8be51daf12d78ed0a909be3b205607d2f27",
-                "reference": "58bee8be51daf12d78ed0a909be3b205607d2f27",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/1042fa0c2ee490bb6da7381f3323f7292ad68222",
+                "reference": "1042fa0c2ee490bb6da7381f3323f7292ad68222",
                "shasum": ""
            },
            "require": {
@@ -10652,7 +10652,7 @@
                "phpstan/phpstan": "^2.1.11"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^12.0",
+                "doctrine/coding-standard": "^13",
                "laravel/framework": "^11.44.2 || ^12.7.2",
                "mockery/mockery": "^1.6.12",
                "nikic/php-parser": "^5.4",
@@ -10688,13 +10688,9 @@
                {
                    "name": "Can Vural",
                    "email": "can9119@gmail.com"
-                },
-                {
-                    "name": "Nuno Maduro",
-                    "email": "enunomaduro@gmail.com"
                }
            ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
            "keywords": [
                "PHPStan",
                "code analyse",
@@ -10707,19 +10703,15 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.3.1"
+                "source": "https://github.com/larastan/larastan/tree/v3.4.0"
            },
            "funding": [
                {
                    "url": "https://github.com/canvural",
                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
                }
            ],
-            "time": "2025-04-03T20:08:04+00:00"
+            "time": "2025-04-22T09:44:59+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -11225,16 +11217,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.12",
+            "version": "2.1.13",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c"
+                "reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
-                "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
+                "reference": "e55e03e6d4ac49cd1240907e5b08e5cd378572a9",
                "shasum": ""
            },
            "require": {
@@ -11279,25 +11271,25 @@
                    "type": "github"
                }
            ],
-            "time": "2025-04-16T13:19:18+00:00"
+            "time": "2025-04-27T12:28:25+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
-            "version": "2.0.1",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
-                "reference": "1cc1259cb91ee4cfbb5c39bca9f635f067c910b4"
+                "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/1cc1259cb91ee4cfbb5c39bca9f635f067c910b4",
-                "reference": "1cc1259cb91ee4cfbb5c39bca9f635f067c910b4",
+                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/9d8e7d4e32711715ad78a1fb6ec368df9af01fdf",
+                "reference": "9d8e7d4e32711715ad78a1fb6ec368df9af01fdf",
                "shasum": ""
            },
            "require": {
                "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.0"
+                "phpstan/phpstan": "^2.1.13"
            },
            "require-dev": {
                "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -11324,9 +11316,9 @@
            "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.1"
+                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.2"
            },
-            "time": "2024-11-28T21:56:36+00:00"
+            "time": "2025-04-26T19:59:57+00:00"
        },
        {
            "name": "phpstan/phpstan-strict-rules",
@@ -11701,16 +11693,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "11.5.17",
+            "version": "11.5.18",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c"
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
-                "reference": "fd2e863a2995cdfd864fb514b5e0b28b09895b5c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc3e887c7f3f9917e1bf61e523413d753db00a17",
+                "reference": "fc3e887c7f3f9917e1bf61e523413d753db00a17",
                "shasum": ""
            },
            "require": {
@@ -11782,7 +11774,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.18"
            },
            "funding": [
                {
@@ -11793,12 +11785,20 @@
                    "url": "https://github.com/sebastianbergmann",
                    "type": "github"
                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-08T07:59:11+00:00"
+            "time": "2025-04-22T06:09:49+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,7 +78,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => '6.2.11',
+    'version'                      => 'develop/2025-04-28',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

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

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

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

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

            // balance
            $('#box-balance-sums').html(balance_top.join(', '));
--- a/resources/assets/v1/src/components/transactions/AccountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/AccountSelect.vue
@@ -216,7 +216,7 @@ export default {
          }
        },
        selectedItem: function (e) {
-          console.log('In SelectedItem()');
+          // console.log('In SelectedItem()');
          if (typeof this.name === 'undefined') {
            // console.log('Is undefined');
            return;
--- a/resources/assets/v1/src/components/transactions/EditTransaction.vue
+++ b/resources/assets/v1/src/components/transactions/EditTransaction.vue
@@ -540,12 +540,18 @@ export default {
                    allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                }
            };
+            // console.log('Destination currency id is ' + result.destination_account.currency_id);
            // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
-            if ('transfer' === transaction.type && null !== transaction.foreign_currency_code) {
+            // OR if the transaction type is a withdrawal, and the destination account is a liability account, same as above.
+            if (
+                ('transfer' === transaction.type && null !== transaction.foreign_currency_code) ||
+                ('withdrawal' === transaction.type && ['Loan', 'Debt', 'Mortgage'].includes(transaction.destination_type) && null !== transaction.foreign_currency_code)
+            ) {
                result.destination_account.currency_id = transaction.foreign_currency_id;
                result.destination_account.currency_name = transaction.foreign_currency_name;
                result.destination_account.currency_code = transaction.foreign_currency_code;
                result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+                // console.log('Set destination currency_id to ' + result.destination_account.currency_id);
            }


--- a/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
@@ -137,7 +137,6 @@ export default {
                // lock dropdown list on currencyID of destination.
                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)
                        ) {
--- a/resources/assets/v1/src/locales/fr.json
+++ b/resources/assets/v1/src/locales/fr.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "Administrations financi\u00e8res",
        "administrations_index_menu": "Administrations financi\u00e8res",
-        "expires_at": "Expires at",
+        "expires_at": "Expire le",
        "temp_administrations_introduction": "Firefly III aura bient\u00f4t la possibilit\u00e9 de g\u00e9rer plusieurs administrations financi\u00e8res. Pour le moment, vous n'en avez qu'une. Vous pouvez d\u00e9finir le titre de cette administration et de sa devise locale. Cela remplace le param\u00e8tre pr\u00e9c\u00e9dent o\u00f9 vous d\u00e9finissiez votre \"devise par d\u00e9faut\". Ce param\u00e8tre est d\u00e9sormais li\u00e9 \u00e0 l'administration financi\u00e8re et peut \u00eatre diff\u00e9rent par administration.",
        "administration_currency_form_help": "La page peut mettre longtemps \u00e0 charger si vous modifiez la devise locale, car des op\u00e9rations peuvent n\u00e9cessiter une conversion vers votre (nouvelle) devise locale.",
        "administrations_page_edit_sub_title_js": "Modifier l'administration financi\u00e8re \"{title}\"",
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
        "administrations_index_menu": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
-        "expires_at": "Expires at",
+        "expires_at": "\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442",
        "temp_administrations_introduction": "Firefly III \u0432\u0441\u043a\u043e\u0440\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u043c\u0438 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043c\u0438. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0434\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u0435\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443. \u042d\u0442\u043e \u0437\u0430\u043c\u0435\u043d\u044f\u0435\u0442 \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0432\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 \"\u0432\u0430\u043b\u044e\u0442\u0443 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e\". \u0412 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u044d\u0442\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441\u0432\u044f\u0437\u0430\u043d\u0430 \u0441 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0435\u0439 \u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u043e\u0439 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430.",
        "administration_currency_form_help": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u043c\u043d\u043e\u0433\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0430 \u0432 \u043d\u043e\u0432\u0443\u044e \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443.",
        "administrations_page_edit_sub_title_js": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438 \"{title}\"",
--- a/resources/assets/v1/src/locales/sl.json
+++ b/resources/assets/v1/src/locales/sl.json
@@ -2,7 +2,7 @@
    "firefly": {
        "administrations_page_title": "Finan\u010dne administracije",
        "administrations_index_menu": "Finan\u010dne administracije",
-        "expires_at": "Expires at",
+        "expires_at": "Pote\u010de ob",
        "temp_administrations_introduction": "Firefly III bo kmalu dobil mo\u017enost upravljanja ve\u010d finan\u010dnih administracij. Trenutno imate samo eno. Nastavite lahko naziv te administracije in njeno doma\u010do valuto. To nadome\u0161\u010da prej\u0161njo nastavitev, kjer bi nastavili svojo \"privzeto valuto\". Ta nastavitev je zdaj vezana na finan\u010dno administracijo in se lahko razlikuje glede na administracijo.",
        "administration_currency_form_help": "\u010ce spremenite doma\u010do valuto, lahko traja dolgo \u010dasa, da se stran nalo\u017ei, ker bo transakcijo morda treba pretvoriti v va\u0161o (novo) doma\u010do valuto.",
        "administrations_page_edit_sub_title_js": "Uredi finan\u010dno administracijo \"{title}\"",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -27,7 +27,7 @@
        "chartjs-adapter-date-fns": "^3.0.0",
        "chartjs-chart-sankey": "^0.14.0",
        "date-fns": "^4.0.0",
-        "i18next": "^24.2.0",
+        "i18next": "^25.0.1",
        "i18next-chained-backend": "^4.6.2",
        "i18next-http-backend": "^3.0.1",
        "i18next-localstorage-backend": "^4.2.0",
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -802,7 +802,7 @@ return [
    'action_value'                                            => 'Action value',
    'stop_executing_other_actions'                            => 'Stop executing other actions',
    'add_rule_action'                                         => 'Add new action',
-    'edit_rule'                                               => 'Edit rule ":title"',
+    'edit_rule'                                               => 'Edit rule #:nr ":title"',
    'delete_rule'                                             => 'Delete rule ":title"',
    'update_rule'                                             => 'Update rule',
    'test_rule_triggers'                                      => 'See matching transactions',
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -43,6 +43,7 @@ return [
    'recurring_transaction'   => 'Recurring transaction',
    'next_due'                => 'Next due',
    'transaction_type'        => 'Type',
+    'running_balance'         => 'Running balance',
    'lastActivity'            => 'Last activity',
    'balanceDiff'             => 'Balance difference',
    'other_meta_data'         => 'Other meta data',
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -314,6 +314,7 @@
                                        {% endif %}
                                    </td>
                                    <td class="hidden-sm hidden-xs spent" data-id="{{ budget.id }}" style="text-align:right;">
+
                                        {% for spentInfo in budget.spent %}
                                            {{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                                            {% if 0 == activeDaysPassed %}
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -167,7 +167,10 @@
                                    <td style="width:33%;">{{ 'spent'|_ }}</td>
                                    <td>
                                        {% if convertToNative %}
-                                            {{ formatAmountBySymbol(limit.spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }}
+                                            {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+                                            {% if limit.native_spent %}
+                                                ({{ formatAmountBySymbol(limit.native_spent, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                                            {% endif %}
                                        {% else %}
                                            {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
                                        {% endif %}
@@ -215,7 +218,7 @@
        {% if budgetLimit.id %}
        budgetLimitID = {{ budgetLimit.id }};
        var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}';
-        var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}';
+        var currencySymbol = '{{ currencySymbol }}';
        var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}';
        var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}';
        var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}';
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -33,6 +33,9 @@
        <th class="hidden-xs">&nbsp;</th>
        <th>{{ trans('list.description') }}</th>
        <th>{{ trans('list.amount') }}</th>
+        {% if config('firefly.feature_flags.running_balance_column') %}
+        <th>{{ trans('list.running_balance') }}</th>
+        {% endif %}
        <th>{{ trans('list.date') }}</th>
        <th>{{ trans('list.source_account') }}</th>
        <th>{{ trans('list.destination_account') }}</th>
@@ -250,6 +253,31 @@
                        {% endif %}
                    {% endif %}
                </td>
+                {% if config('firefly.feature_flags.running_balance_column') %}
+                <td>
+                    {% if null == transaction.balance_dirty or false == transaction.balance_dirty %}
+                        {% if transaction.transaction_type_type == 'Deposit' %}
+                            {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {% elseif transaction.transaction_type_type == 'Withdrawal' %}
+                            {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {% elseif transaction.transaction_type_type == 'Opening balance' %}
+                            {% if transaction.source_account_type == 'Initial balance account' %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% else %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% endif %}
+                        {% elseif transaction.transaction_type_type == 'Transfer' %}
+                            {% if account.id == transaction.source_account_id %}
+                                {{ formatAmountBySymbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% else %}
+                                {{ formatAmountBySymbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {% endif %}
+                        {% else %}
+                            &nbsp;
+                        {% endif %}
+                    {% endif %}
+                </td>
+                {% endif %}
                <td style=" {{ style|raw }}">
                    {{ transaction.date.isoFormat(monthAndDayFormat) }}
                </td>
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -23,7 +23,7 @@
                    <div class="box-body">
                        {{ ExpandedForm.text('name') }}
                        {{ ExpandedForm.amountNoCurrency('target_amount') }}
-                        {{ CurrencyForm.currencyList('transaction_currency_id', null, {helpText:'piggy_default_currency'|_}) }}
+                        {{ CurrencyForm.currencyList('transaction_currency_id', preFilled.transaction_currency_id, {helpText:'piggy_default_currency'|_}) }}
                        {{ AccountForm.assetLiabilityMultiAccountList('accounts', preFilled.accounts, {label: 'saveOnAccounts'|_, helpText: 'piggy_account_currency_match'|_   }) }}

                    </div>
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -994,7 +994,7 @@ Breadcrumbs::for(
    'rules.edit',
    static function (Generator $breadcrumbs, Rule $rule): void {
        $breadcrumbs->parent('rules.index');
-        $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule]));
+        $breadcrumbs->push(trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]), route('rules.edit', [$rule]));
    }
 );
 Breadcrumbs::for(
Author	SHA1	Message	Date
github-actions[bot]	8f0c0f215c	Merge pull request #10215 from firefly-iii/release-1745810633 🤖 Automatically merge the PR into the develop branch.	2025-04-28 05:24:02 +02:00
JC5	5fc764e72b	🤖 Auto commit for release 'develop' on 2025-04-28	2025-04-28 05:23:53 +02:00
github-actions[bot]	b330313c55	Merge pull request #10213 from firefly-iii/release-1745742741 🤖 Automatically merge the PR into the develop branch.	2025-04-27 10:32:28 +02:00
JC5	aa9ce73758	🤖 Auto commit for release 'develop' on 2025-04-27	2025-04-27 10:32:21 +02:00
github-actions[bot]	d97fda41b2	Merge pull request #10210 from firefly-iii/release-1745681629 🤖 Automatically merge the PR into the develop branch.	2025-04-26 17:33:56 +02:00
JC5	945ad79c03	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 17:33:49 +02:00
James Cole	6273807525	Merge pull request #10209 from firefly-iii/add-transfer-type Add transfer type	2025-04-26 17:29:31 +02:00
James Cole	50803a2c24	Add transfer type	2025-04-26 17:29:10 +02:00
github-actions[bot]	a0e9b05680	Merge pull request #10208 from firefly-iii/release-1745674111 🤖 Automatically merge the PR into the develop branch.	2025-04-26 15:28:37 +02:00
JC5	41e74cd816	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 15:28:31 +02:00
James Cole	b379c8e36b	Merge pull request #10207 from firefly-iii/fix-running-balance Fix running balance	2025-04-26 15:24:36 +02:00
James Cole	76e893f86e	Fix running balance	2025-04-26 15:24:14 +02:00
github-actions[bot]	5da1599959	Merge pull request #10206 from firefly-iii/release-1745670593 🤖 Automatically merge the PR into the develop branch.	2025-04-26 14:30:02 +02:00
JC5	1d997e7c86	🤖 Auto commit for release 'develop' on 2025-04-26	2025-04-26 14:29:53 +02:00
James Cole	35e2eba303	Merge pull request #10205 from firefly-iii/fix-10197 Fix #10197	2025-04-26 14:24:37 +02:00
James Cole	b50f8f8ecd	Fix #10197	2025-04-26 14:24:13 +02:00
James Cole	c16d3be85f	Merge pull request #10204 from firefly-iii/running-balance Add running balance column.	2025-04-26 14:20:23 +02:00
James Cole	bd1232644f	Add running balance column.	2025-04-26 14:20:00 +02:00
James Cole	37ca460ff2	Merge pull request #10203 from den-is/develop Fix Ukrainian language names	2025-04-26 13:52:47 +02:00
Denis Iskandarov	478acdc847	Fix Ukrainian language names Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>	2025-04-25 18:41:22 +04:00
James Cole	f9ec94ea97	Merge pull request #10184 from firefly-iii/fix-10180 Fix #10180	2025-04-22 20:42:04 +02:00
James Cole	576c5f242c	Fix #10180	2025-04-22 20:41:08 +02:00
github-actions[bot]	dba8bba41a	Merge pull request #10177 from firefly-iii/release-1745301598 🤖 Automatically merge the PR into the develop branch.	2025-04-22 08:00:06 +02:00
JC5	55a00aa6fe	🤖 Auto commit for release 'develop' on 2025-04-22	2025-04-22 07:59:58 +02:00
James Cole	22133f64cf	Merge pull request #10176 from firefly-iii/fix-null Fix nullpointer	2025-04-22 07:56:01 +02:00
Sander Dorigo	2efb2377b6	Fix nullpointer	2025-04-22 07:55:14 +02:00
James Cole	9f75a96ad6	Merge pull request #10172 from firefly-iii/dependabot/npm_and_yarn/develop/i18next-25.0.1 Bump i18next from 24.2.3 to 25.0.1	2025-04-21 08:04:29 +02:00
James Cole	d0be9bb957	Merge pull request #10174 from firefly-iii/fix-10114 Fix #10114	2025-04-21 08:04:16 +02:00
James Cole	c25adf0a56	Fix #10114	2025-04-21 08:03:32 +02:00
mergify[bot]	0ca79fd843	Merge branch 'develop' into dependabot/npm_and_yarn/develop/i18next-25.0.1	2025-04-21 05:17:23 +00:00
James Cole	efc516eb3b	Merge pull request #10173 from firefly-iii/main Merge pull request #10170 from firefly-iii/develop	2025-04-21 07:16:48 +02:00
dependabot[bot]	dca3ac9250	Bump i18next from 24.2.3 to 25.0.1 Bumps [i18next](https://github.com/i18next/i18next) from 24.2.3 to 25.0.1. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v24.2.3...v25.0.1) --- updated-dependencies: - dependency-name: i18next dependency-version: 25.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-04-21 04:07:28 +00:00
github-actions[bot]	33668a3688	Merge pull request #10171 from firefly-iii/release-1745205809 🤖 Automatically merge the PR into the develop branch.	2025-04-21 05:23:36 +02:00
JC5	5414a70abb	🤖 Auto commit for release 'develop' on 2025-04-21	2025-04-21 05:23:29 +02:00
github-actions[bot]	85aee63d1e	Merge pull request #10170 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-04-20 21:22:09 +02:00
github-actions[bot]	ad09c851f6	Merge pull request #10169 from firefly-iii/release-1745176916 🤖 Automatically merge the PR into the develop branch.	2025-04-20 21:22:04 +02:00
JC5	c57f36820b	🤖 Auto commit for release 'v6.2.12' on 2025-04-20	2025-04-20 21:21:56 +02:00
github-actions[bot]	6bb2702e07	Merge pull request #10168 from firefly-iii/release-1745176354 🤖 Automatically merge the PR into the develop branch.	2025-04-20 21:12:43 +02:00
JC5	b1dbd3ee17	🤖 Auto commit for release 'develop' on 2025-04-20	2025-04-20 21:12:34 +02:00
James Cole	2d41db349a	Merge pull request #10167 from firefly-iii/update-changelog2 Update changelog	2025-04-20 21:07:06 +02:00
James Cole	6b73b9327a	Update changelog	2025-04-20 21:06:27 +02:00
James Cole	e3ea54329d	Merge pull request #10166 from firefly-iii/add-events Add some piggy bank events.	2025-04-20 21:04:27 +02:00
James Cole	686a76f32c	Merge pull request #10165 from firefly-iii/fix-10162 Fix #10162	2025-04-20 21:04:07 +02:00
James Cole	cdafb82a49	Merge pull request #10164 from firefly-iii/fix-10068-2 Fix #10068	2025-04-20 21:03:52 +02:00
James Cole	0075f10f98	Fix #10162	2025-04-20 21:02:54 +02:00
James Cole	b70c0e4ab3	Add some piggy bank events.	2025-04-20 21:01:23 +02:00
James Cole	01aca092a1	Fix #10068	2025-04-20 21:00:43 +02:00
James Cole	8e6449ec12	Merge pull request #10161 from firefly-iii/fix-9755 Fix #9755	2025-04-20 12:59:11 +02:00
James Cole	984c4e2449	Fix #9755	2025-04-20 12:58:45 +02:00
James Cole	002c5485f5	Merge pull request #10160 from firefly-iii/fix-9867 Fix #9867	2025-04-20 12:47:35 +02:00
James Cole	12d74f15c0	Fix #9867	2025-04-20 12:47:13 +02:00
James Cole	2e87e179f0	Merge pull request #10159 from firefly-iii/fix-9878 Fix #9878	2025-04-20 12:42:20 +02:00
James Cole	a861126c0f	Fix #9878	2025-04-20 12:41:46 +02:00