Merge pull request #10671 from firefly-iii/release-1753858574

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-07-30
2025-09-02 11:04:53 +00:00 · 2025-07-30 08:56:22 +02:00 · 2025-07-30 08:56:14 +02:00 · 2025-07-30 08:37:19 +02:00 · 2025-07-30 07:27:00 +02:00 · 2025-07-30 07:26:50 +02:00
56 changed files with 1167 additions and 852 deletions
--- a/.ci/php-cs-fixer/.php-cs-fixer.php
+++ b/.ci/php-cs-fixer/.php-cs-fixer.php
@@ -33,6 +33,7 @@ $finder = PhpCsFixer\Finder::create()


 $config = (new PhpCsFixer\Config())
+        // ->setUnsupportedPhpVersionAllowed(true) // use this when PHP 8.5 comes out.
        ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
        ;
 return $config->setRules(
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -406,20 +406,20 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.84.0",
+            "version": "v3.85.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "38dad0767bf2a9b516b976852200ae722fe984ca"
+                "reference": "2fb6d7f6c3398dca5786a1635b27405d73a417ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/38dad0767bf2a9b516b976852200ae722fe984ca",
-                "reference": "38dad0767bf2a9b516b976852200ae722fe984ca",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2fb6d7f6c3398dca5786a1635b27405d73a417ba",
+                "reference": "2fb6d7f6c3398dca5786a1635b27405d73a417ba",
                "shasum": ""
            },
            "require": {
-                "clue/ndjson-react": "^1.0",
+                "clue/ndjson-react": "^1.3",
                "composer/semver": "^3.4",
                "composer/xdebug-handler": "^3.0.5",
                "ext-filter": "*",
@@ -429,12 +429,12 @@
                "fidry/cpu-core-counter": "^1.2",
                "php": "^7.4 || ^8.0",
                "react/child-process": "^0.6.6",
-                "react/event-loop": "^1.0",
-                "react/promise": "^2.11 || ^3.0",
-                "react/socket": "^1.0",
-                "react/stream": "^1.0",
+                "react/event-loop": "^1.5",
+                "react/promise": "^3.2",
+                "react/socket": "^1.16",
+                "react/stream": "^1.4",
                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
-                "symfony/console": "^5.4.45 || ^6.4.13 || ^7.0",
+                "symfony/console": "^5.4.47 || ^6.4.13 || ^7.0",
                "symfony/event-dispatcher": "^5.4.45 || ^6.4.13 || ^7.0",
                "symfony/filesystem": "^5.4.45 || ^6.4.13 || ^7.0",
                "symfony/finder": "^5.4.45 || ^6.4.17 || ^7.0",
@@ -499,7 +499,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.84.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.85.1"
            },
            "funding": [
                {
@@ -507,7 +507,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-07-15T18:21:57+00:00"
+            "time": "2025-07-29T22:22:50+00:00"
        },
        {
            "name": "psr/container",
--- a/.ci/phpcs.sh
+++ b/.ci/phpcs.sh
@@ -26,7 +26,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
+./vendor/bin/php-cs-fixer fix \
    --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
    --format=txt \
    -v \
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -66,7 +66,6 @@ jobs:
              'label-actions.yml',
              'lock.yml',
              'release.yml',
-              'sonarcloud.yml',
              'stale.yml'
            ]

--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -1,71 +0,0 @@
-name: 'Code - Run Sonarcloud'
-on:
-  pull_request:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-env:
-  DB_CONNECTION: sqlite
-  APP_KEY: TestTestTestTestTestTestTestTest
-jobs:
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup PHP with Xdebug
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.4'
-          coverage: xdebug
-          extensions: >-
-            bcmath
-            curl
-            fileinfo
-            iconv
-            intl
-            json
-            sqlite3
-            mbstring
-            openssl
-            pdo
-            session
-            simplexml
-            sodium
-            tokenizer
-            xml
-            xmlwriter
-
-      - name: Copy standard configuration
-        run: cp .env.testing .env
-
-      - name: Install Composer dependencies
-        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
-
-      - name: "Create database file"
-        run: |
-          touch storage/database/database.sqlite
-          wget -q https://github.com/firefly-iii/test-fixtures/raw/refs/heads/main/test-database.sqlite -O storage/database/database.sqlite
-
-      - name: "Upgrades the database to the latest version"
-        run: |
-          php artisan firefly-iii:upgrade-database
-          chmod 600 storage/oauth-public.key
-          chmod 600 storage/oauth-private.key
-
-      - name: "Integrity Database Report"
-        run: php artisan firefly-iii:report-integrity
-
-      - name: "Run tests with coverage"
-        run: composer coverage
-
-      - name: Fix code coverage paths
-        run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
-
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarqube-scan-action@v5.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -24,16 +24,16 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Controllers\Chart;

-use FireflyIII\Exceptions\ValidationException;
-use FireflyIII\Models\TransactionCurrency;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Preference;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Chart\ChartData;
 use FireflyIII\Support\Facades\Preferences;
@@ -42,6 +42,7 @@ use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;

 /**
 * Class AccountController
@@ -86,10 +87,12 @@ class AccountController extends Controller
        // move date to end of day
        $queryParameters['start']->startOfDay();
        $queryParameters['end']->endOfDay();
+        Log::debug(sprintf('dashboard(), convert to native: %s', var_export($this->convertToNative, true)));

        // loop each account, and collect info:
        /** @var Account $account */
        foreach ($accounts as $account) {
+            Log::debug(sprintf('Account #%d ("%s")', $account->id, $account->name));
            $this->renderAccountData($queryParameters, $account);
        }

@@ -101,15 +104,22 @@ class AccountController extends Controller
     */
    private function renderAccountData(array $params, Account $account): void
    {
-        $currency     = $this->repository->getAccountCurrency($account);
+        Log::debug(sprintf('Now in %s(array, #%d)', __METHOD__, $account->id));
+        $currency       = $this->repository->getAccountCurrency($account);
+        $currentStart   = clone $params['start'];
+        $range          = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
+
+
+        $previous       = array_values($range)[0]['balance'];
+        $nativePrevious = null;
        if (!$currency instanceof TransactionCurrency) {
            $currency = $this->default;
        }
-        $currentSet   = [
+        $currentSet     = [
            'label'                   => $account->name,

            // the currency that belongs to the account.
-            'currency_id'             => (string) $currency->id,
+            'currency_id'             => (string)$currency->id,
            'currency_code'           => $currency->code,
            'currency_symbol'         => $currency->symbol,
            'currency_decimal_places' => $currency->decimal_places,
@@ -121,18 +131,33 @@ class AccountController extends Controller
            'period'                  => '1D',
            'entries'                 => [],
        ];
-        $currentStart = clone $params['start'];
-        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
+        if ($this->convertToNative) {
+            $currentSet['native_entries']                 = [];
+            $currentSet['native_currency_id']             = (string)$this->nativeCurrency->id;
+            $currentSet['native_currency_code']           = $this->nativeCurrency->code;
+            $currentSet['native_currency_symbol']         = $this->nativeCurrency->symbol;
+            $currentSet['native_currency_decimal_places'] = $this->nativeCurrency->decimal_places;
+            $nativePrevious                               = array_values($range)[0]['native_balance'];
+        }
+

-        $previous     = array_values($range)[0]['balance'];
        while ($currentStart <= $params['end']) {
            $format                        = $currentStart->format('Y-m-d');
            $label                         = $currentStart->toAtomString();
            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
            $previous                      = $balance;
+            $currentSet['entries'][$label] = $balance;
+
+
+            // do the same for the native balance, if relevant:
+            $nativeBalance                 = null;
+            if ($this->convertToNative) {
+                $nativeBalance                        = array_key_exists($format, $range) ? $range[$format]['native_balance'] : $nativePrevious;
+                $nativePrevious                       = $nativeBalance;
+                $currentSet['native_entries'][$label] = $nativeBalance;
+            }

            $currentStart->addDay();
-            $currentSet['entries'][$label] = $balance;
        }
        $this->chartData->add($currentSet);
    }
@@ -146,19 +171,84 @@ class AccountController extends Controller
    public function overview(DateRequest $request): JsonResponse
    {
        // parameters for chart:
-        $dates      = $request->getAll();
+        $dates        = $request->getAll();
+

        /** @var Carbon $start */
-        $start      = $dates['start'];
+        $start        = $dates['start'];

        /** @var Carbon $end */
-        $end        = $dates['end'];
+        $end          = $dates['end'];

        // set dates to end of day + start of day:
        $start->startOfDay();
        $end->endOfDay();

-        // user's preferences
+        $frontPageIds = $this->getFrontPageAccountIds();
+        $accounts     = $this->repository->getAccountsById($frontPageIds);
+        $chartData    = [];
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            Log::debug(sprintf('Rendering chart data for account %s (%d)', $account->name, $account->id));
+            $currency       = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
+            $currentStart   = clone $start;
+            $range          = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
+            $previous       = array_values($range)[0]['balance'];
+            $nativePrevious = null;
+            $currentSet     = [
+                'label'                   => $account->name,
+                'currency_id'             => (string)$currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'start_date'              => $start->toAtomString(),
+                'end_date'                => $end->toAtomString(),
+                'type'                    => 'line', // line, area or bar
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => [],
+            ];
+
+            // add "native_entries" if convertToNative is true:
+            if ($this->convertToNative) {
+                $currentSet['native_entries']                 = [];
+                $currentSet['native_currency_id']             = (string)$this->nativeCurrency->id;
+                $currentSet['native_currency_code']           = $this->nativeCurrency->code;
+                $currentSet['native_currency_symbol']         = $this->nativeCurrency->symbol;
+                $currentSet['native_currency_decimal_places'] = $this->nativeCurrency->decimal_places;
+                $nativePrevious                               = array_values($range)[0]['native_balance'];
+
+            }
+
+            // also get the native balance if convertToNative is true:
+            while ($currentStart <= $end) {
+                $format                        = $currentStart->format('Y-m-d');
+                $label                         = $currentStart->toAtomString();
+
+                // balance is based on "balance" from the $range variable.
+                $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
+                $previous                      = $balance;
+                $currentSet['entries'][$label] = $balance;
+
+                // do the same for the native balance, if relevant:
+                $nativeBalance                 = null;
+                if ($this->convertToNative) {
+                    $nativeBalance                        = array_key_exists($format, $range) ? $range[$format]['native_balance'] : $nativePrevious;
+                    $nativePrevious                       = $nativeBalance;
+                    $currentSet['native_entries'][$label] = $nativeBalance;
+                }
+
+                $currentStart->addDay();
+
+            }
+            $chartData[]    = $currentSet;
+        }
+
+        return response()->json($chartData);
+    }
+
+    private function getFrontPageAccountIds(): array
+    {
        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();

        /** @var Preference $frontpage */
@@ -169,41 +259,6 @@ class AccountController extends Controller
            $frontpage->save();
        }

-        // get accounts:
-        $accounts   = $this->repository->getAccountsById($frontpage->data);
-        $chartData  = [];
-
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $currency     = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
-            $field        = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
-            $currentSet   = [
-                'label'                   => $account->name,
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'start_date'              => $start->toAtomString(),
-                'end_date'                => $end->toAtomString(),
-                'type'                    => 'line', // line, area or bar
-                'yAxisID'                 => 0, // 0, 1, 2
-                'entries'                 => [],
-            ];
-            // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
-            $currentStart = clone $start;
-            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
-            $previous     = array_values($range)[0][$field];
-            while ($currentStart <= $end) {
-                $format                        = $currentStart->format('Y-m-d');
-                $label                         = $currentStart->toAtomString();
-                $balance                       = array_key_exists($format, $range) ? $range[$format][$field] : $previous;
-                $previous                      = $balance;
-                $currentStart->addDay();
-                $currentSet['entries'][$label] = $balance;
-            }
-            $chartData[]  = $currentSet;
-        }
-
-        return response()->json($chartData);
+        return $frontpage->data ?? $defaultSet;
    }
 }
--- a/app/Api/V1/Controllers/Chart/BudgetController.php
+++ b/app/Api/V1/Controllers/Chart/BudgetController.php
@@ -77,6 +77,8 @@ class BudgetController extends Controller

    /**
     * TODO see autocomplete/accountcontroller
+     *
+     * @throws FireflyException
     */
    public function dashboard(DateRequest $request): JsonResponse
    {
@@ -107,23 +109,59 @@ class BudgetController extends Controller
    private function processBudget(Budget $budget, Carbon $start, Carbon $end): array
    {
        // get all limits:
-        $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
-        $rows   = [];
+        $limits   = $this->blRepository->getBudgetLimits($budget, $start, $end);
+
+        //      'currency_id' => string '1' (length=1)
+        //      'currency_code' => string 'EUR' (length=3)
+        //      'currency_name' => string 'Euro' (length=4)
+        //      'currency_symbol' => string '€' (length=3)
+        //      'currency_decimal_places' => int 2
+        //      'start' => string '2025-07-01T00:00:00+02:00' (length=25)
+        //      'end' => string '2025-07-31T23:59:59+02:00' (length=25)
+        //      'budgeted' => string '100.000000000000' (length=16)
+        //      'spent' => string '-421.230000000000' (length=17)
+        //      'left' => string '0' (length=1)
+        //      'overspent' => string '321.230000000000' (length=16)
+
+
+        $rows     = [];
+
+        // instead of using the budget limits as a thing to collect all expenses,
+        // use the budget range itself to collect and group them,
+        // AND THEN add budgeted amounts from the limits to the rows.
+        $spent    = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+        $expenses = $this->processExpenses($budget->id, $spent, $start, $end);
+
+        /**
+         * @var int   $currencyId
+         * @var array $row
+         */
+        foreach ($expenses as $currencyId => $row) {
+            // budgeted, left and overspent are now 0.
+            $limit  = $this->filterLimit($currencyId, $limits);
+            if (null !== $limit) {
+                $row['budgeted']  = $limit->amount;
+                $row['left']      = bcsub($row['budgeted'], bcmul($row['spent'], '-1'));
+                $row['overspent'] = bcmul($row['left'], '-1');
+                $row['left']      = 1 === bccomp($row['left'], '0') ? $row['left'] : '0';
+                $row['overspent'] = 1 === bccomp($row['overspent'], '0') ? $row['overspent'] : '0';
+            }
+            $rows[] = $row;
+        }
+

        // if no limits
-        if (0 === $limits->count()) {
-            // return as a single item in an array
-            $rows = $this->noBudgetLimits($budget, $start, $end);
-        }
-        if ($limits->count() > 0) {
-            $rows = $this->budgetLimits($budget, $limits);
-        }
+        //        if (0 === $limits->count()) {
+        //             return as a single item in an array
+        //            $rows = $this->noBudgetLimits($budget, $start, $end);
+        //        }
+
        // is always an array
-        $return = [];
+        $return   = [];
        foreach ($rows as $row) {
            $current  = [
                'label'                   => $budget->name,
-                'currency_id'             => (string) $row['currency_id'],
+                'currency_id'             => (string)$row['currency_id'],
                'currency_code'           => $row['currency_code'],
                'currency_name'           => $row['currency_name'],
                'currency_decimal_places' => $row['currency_decimal_places'],
@@ -131,6 +169,7 @@ class BudgetController extends Controller
                'start'                   => $row['start'],
                'end'                     => $row['end'],
                'entries'                 => [
+                    'budgeted'  => $row['budgeted'],
                    'spent'     => $row['spent'],
                    'left'      => $row['left'],
                    'overspent' => $row['overspent'],
@@ -159,11 +198,9 @@ class BudgetController extends Controller
     * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return
     * its info.
     *
-     * @param array<int, array<int, string>> $array
-     *
     * @throws FireflyException
     */
-    private function processExpenses(int $budgetId, array $array, Carbon $start, Carbon $end): array
+    private function processExpenses(int $budgetId, array $spent, Carbon $start, Carbon $end): array
    {
        $return = [];

@@ -174,16 +211,17 @@ class BudgetController extends Controller
         * @var int   $currencyId
         * @var array $block
         */
-        foreach ($array as $currencyId => $block) {
+        foreach ($spent as $currencyId => $block) {
            $this->currencies[$currencyId] ??= TransactionCurrency::find($currencyId);
            $return[$currencyId]           ??= [
-                'currency_id'             => (string) $currencyId,
+                'currency_id'             => (string)$currencyId,
                'currency_code'           => $block['currency_code'],
                'currency_name'           => $block['currency_name'],
                'currency_symbol'         => $block['currency_symbol'],
-                'currency_decimal_places' => (int) $block['currency_decimal_places'],
+                'currency_decimal_places' => (int)$block['currency_decimal_places'],
                'start'                   => $start->toAtomString(),
                'end'                     => $end->toAtomString(),
+                'budgeted'                => '0',
                'spent'                   => '0',
                'left'                    => '0',
                'overspent'               => '0',
@@ -193,7 +231,7 @@ class BudgetController extends Controller
            // var_dump($return);
            /** @var array $journal */
            foreach ($currentBudgetArray['transaction_journals'] as $journal) {
-                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], (string) $journal['amount']);
+                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], (string)$journal['amount']);
            }
        }

@@ -240,16 +278,28 @@ class BudgetController extends Controller
        $filtered        = array_filter($spent, fn ($entry) => $entry['currency_id'] === $limitCurrencyId);
        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
        if (1 === count($result)) {
-            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
+            $compare                              = bccomp($limit->amount, (string)app('steam')->positive($result[$limitCurrencyId]['spent']));
+            $result[$limitCurrencyId]['budgeted'] = $limit->amount;
            if (1 === $compare) {
                // convert this amount into the native currency:
-                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']);
+                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']);
            }
            if ($compare <= 0) {
-                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']));
+                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string)$result[$limitCurrencyId]['spent']));
            }
        }

        return $result;
    }
+
+    private function filterLimit(int $currencyId, Collection $limits): ?BudgetLimit
+    {
+        foreach ($limits as $limit) {
+            if ($limit->transaction_currency_id === $currencyId) {
+                return $limit;
+            }
+        }
+
+        return null;
+    }
 }
--- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php
@@ -147,6 +147,7 @@ class ShowController extends Controller
        $enrichment->setUser($admin);
        $selectedGroup = $enrichment->enrichSingle($selectedGroup);

+
        /** @var TransactionGroupTransformer $transformer */
        $transformer   = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Handlers/Events/WebhookEventHandler.php
+++ b/app/Handlers/Events/WebhookEventHandler.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Handlers\Events;

 use FireflyIII\Jobs\SendWebhookMessage;
 use FireflyIII\Models\WebhookMessage;
+use Illuminate\Support\Facades\Log;

 /**
 * Class WebhookEventHandler
@@ -37,7 +38,13 @@ class WebhookEventHandler
     */
    public function sendWebhookMessages(): void
    {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        if (false === config('firefly.feature_flags.webhooks') || false === config('firefly.allow_webhooks')) {
+            Log::info('Webhook event handler is disabled, do not run sendWebhookMessages().');
+
+            return;
+        }
+
        // kick off the job!
        $messages = WebhookMessage::where('webhook_messages.sent', false)
            ->get(['webhook_messages.*'])
@@ -45,14 +52,14 @@ class WebhookEventHandler
                static fn (WebhookMessage $message) => $message->webhookAttempts()->count() <= 2
            )->splice(0, 5)
        ;
-        app('log')->debug(sprintf('Found %d webhook message(s) ready to be send.', $messages->count()));
+        Log::debug(sprintf('Found %d webhook message(s) ready to be send.', $messages->count()));
        foreach ($messages as $message) {
            if (false === $message->sent) {
-                app('log')->debug(sprintf('Send message #%d', $message->id));
+                Log::debug(sprintf('Send message #%d', $message->id));
                SendWebhookMessage::dispatch($message)->afterResponse();
            }
            if (false !== $message->sent) {
-                app('log')->debug(sprintf('Skip message #%d', $message->id));
+                Log::debug(sprintf('Skip message #%d', $message->id));
            }
        }
    }
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -558,7 +558,6 @@ class GroupCollector implements GroupCollectorInterface
                $groups[$groupId]['transactions'][$journalId] = $this->parseAugmentedJournal($augumentedJournal);
            }
        }
-
        $groups = $this->parseSums($groups);

        return new Collection($groups);
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -88,7 +88,9 @@ class IndexController extends Controller

        /** @var Carbon $end */
        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());
-        $start->subDay();
+
+        // #10618 go to the end of the previous day.
+        $start->subSecond();

        $ids           = $accounts->pluck('id')->toArray();
        Log::debug(sprintf('inactive start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
@@ -164,8 +166,8 @@ class IndexController extends Controller
        /** @var Carbon $end */
        $end           = clone session('end', today(config('app.timezone'))->endOfMonth());

-        // 2025-05-11 removed this so start is exactly the start of the month.
-        // $start->subDay();
+        // #10618 go to the end of the previous day.
+        $start->subSecond();

        $ids           = $accounts->pluck('id')->toArray();
        Log::debug(sprintf('index start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -154,12 +154,18 @@ class TagController extends Controller
     */
    public function index(TagRepositoryInterface $repository)
    {
-        // start with oldest tag
+        // start with the oldest tag
        $first           = session('first', today()) ?? today();
        $oldestTagDate   = $repository->oldestTag() instanceof Tag ? $repository->oldestTag()->date : clone $first;
        $newestTagDate   = $repository->newestTag() instanceof Tag ? $repository->newestTag()->date : today();
        $oldestTagDate->startOfYear();
        $newestTagDate->endOfYear();
+
+        if ($oldestTagDate->year < 1970) {
+            $oldestTagDate = Carbon::create(1970, 1, 1, 0, 0, 0, config('app.timezone'));
+            request()->session()->flash('error', trans('firefly.bad_date_transaction'));
+        }
+
        $tags            = [];
        $tags['no-date'] = $repository->getTagsInYear(null);

--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -312,11 +312,23 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
        Log::debug(sprintf('Search for linked journals between %s and %s', $start->toW3cString(), $end->toW3cString()));

        return $bill->transactionJournals()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')
+            ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')
+            ->where('transactions.amount', '>', 0)
            ->before($end)->after($start)->get(
                [
                    'transaction_journals.id',
                    'transaction_journals.date',
                    'transaction_journals.transaction_group_id',
+                    'transactions.transaction_currency_id',
+                    'currency.code AS transaction_currency_code',
+                    'currency.decimal_places AS transaction_currency_decimal_places',
+                    'transactions.foreign_currency_id',
+                    'foreign_currency.code AS foreign_currency_code',
+                    'foreign_currency.decimal_places AS foreign_currency_decimal_places',
+                    'transactions.amount',
+                    'transactions.foreign_amount',
                ]
            )
        ;
--- a/app/Support/Amount.php
+++ b/app/Support/Amount.php
@@ -32,6 +32,7 @@ use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use NumberFormatter;

 /**
@@ -66,13 +67,13 @@ class Amount
        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $symbol);
        $fmt->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $decimalPlaces);
        $fmt->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $decimalPlaces);
-        $result  = (string) $fmt->format((float) $rounded); // intentional float
+        $result  = (string)$fmt->format((float)$rounded); // intentional float

        if (true === $coloured) {
-            if (1 === bccomp((string) $rounded, '0')) {
+            if (1 === bccomp((string)$rounded, '0')) {
                return sprintf('<span class="text-success money-positive">%s</span>', $result);
            }
-            if (-1 === bccomp((string) $rounded, '0')) {
+            if (-1 === bccomp((string)$rounded, '0')) {
                return sprintf('<span class="text-danger money-negative">%s</span>', $result);
            }

@@ -106,23 +107,21 @@ class Amount
        $amount          = $journal[$field] ?? '0';
        // Log::debug(sprintf('Field is %s, amount is %s', $field, $amount));
        // fallback, the transaction has a foreign amount in $currency.
-        if ($convertToNative && null !== $journal['foreign_amount'] && $currency->id === (int) $journal['foreign_currency_id']) {
+        if ($convertToNative && null !== $journal['foreign_amount'] && $currency->id === (int)$journal['foreign_currency_id']) {
            $amount = $journal['foreign_amount'];
            // Log::debug(sprintf('Overruled, amount is now %s', $amount));
        }

-        return (string) $amount;
+        return (string)$amount;
    }

    public function convertToNative(?User $user = null): bool
    {
        if (!$user instanceof User) {
            return true === Preferences::get('convert_to_native', false)->data && true === config('cer.enabled');
-            //            Log::debug(sprintf('convertToNative [a]: %s', var_export($result, true)));
        }

        return true === Preferences::getForUser($user, 'convert_to_native', false)->data && true === config('cer.enabled');
-        // Log::debug(sprintf('convertToNative [b]: %s', var_export($result, true)));
    }

    public function getNativeCurrency(): TransactionCurrency
@@ -180,9 +179,9 @@ class Amount
            return '0';
        }
        $amount            = $sourceTransaction->{$field} ?? '0';
-        if ((int) $sourceTransaction->foreign_currency_id === $currency->id) {
+        if ((int)$sourceTransaction->foreign_currency_id === $currency->id) {
            // use foreign amount instead!
-            $amount = (string) $sourceTransaction->foreign_amount; // hard coded to be foreign amount.
+            $amount = (string)$sourceTransaction->foreign_amount; // hard coded to be foreign amount.
        }

        return $amount;
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -93,7 +93,7 @@ class Steam

            return [];
        }
-        $defaultCurrency = app('amount')->getNativeCurrency();
+        $defaultCurrency = Amount::getNativeCurrency();
        if ($convertToNative) {
            if ($defaultCurrency->id === $currency?->id) {
                Log::debug(sprintf('Unset [%s] for account #%d (no longer unset "native_balance")', $defaultCurrency->code, $account->id));
@@ -224,7 +224,7 @@ class Steam
        $request->subDay()->endOfDay();
        Log::debug(sprintf('finalAccountBalanceInRange: Call finalAccountBalance with date/time "%s"', $request->toIso8601String()));
        $startBalance         = $this->finalAccountBalance($account, $request);
-        $nativeCurrency       = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
+        $nativeCurrency       = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
        $accountCurrency      = $this->getAccountCurrency($account);
        $hasCurrency          = $accountCurrency instanceof TransactionCurrency;
        $currency             = $accountCurrency ?? $nativeCurrency;
@@ -294,7 +294,7 @@ class Steam
            $currentBalance[$entryCurrency->code]        ??= '0';
            $currentBalance[$entryCurrency->code] = bcadd($sumOfDay, (string) $currentBalance[$entryCurrency->code]);

-            // if not convert to native, add the amount to "balance", do nothing else.
+            // if not requested to convert to native, add the amount to "balance", do nothing else.
            if (!$convertToNative) {
                $currentBalance['balance'] = bcadd((string) $currentBalance['balance'], $sumOfDay);
            }
@@ -302,13 +302,13 @@ class Steam
            // if there is a request to convert, convert to "native_balance" and use "balance" for whichever amount is in the native currency.
            if ($convertToNative) {
                $nativeSumOfDay                   = $converter->convert($entryCurrency, $nativeCurrency, $carbon, $sumOfDay);
-                $currentBalance['native_balance'] = bcadd((string) $currentBalance['native_balance'], $nativeSumOfDay);
+                $currentBalance['native_balance'] = bcadd((string) ($currentBalance['native_balance'] ?? '0'), $nativeSumOfDay);
+                // if it's the same currency as the entry, also add to balance (see other code).
                if ($currency->id === $entryCurrency->id) {
                    $currentBalance['balance'] = bcadd((string) $currentBalance['balance'], $sumOfDay);
                }
-
            }
-            // just set it.
+            // add to final array.
            $balances[$carbonKey]                 = $currentBalance;
            Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);
        }
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -67,8 +67,8 @@ class AccountTransformer extends AbstractTransformer
        }

        // get account type:
-        $accountType                                                  = (string) config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
-        $liabilityType                                                = (string) config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
+        $accountType                                                  = (string)config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
+        $liabilityType                                                = (string)config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
        $liabilityType                                                = '' === $liabilityType ? null : strtolower($liabilityType);

        $liabilityDirection                                           = $account->meta['liability_direction'] ?? null;
@@ -89,10 +89,10 @@ class AccountTransformer extends AbstractTransformer
            $native = null;
        }

-        $decimalPlaces                                                = (int) $account->meta['currency']?->decimal_places;
+        $decimalPlaces                                                = (int)$account->meta['currency']?->decimal_places;
        $decimalPlaces                                                = 0 === $decimalPlaces ? 2 : $decimalPlaces;
-        $openingBalance                                               = Steam::bcround($openingBalance, $decimalPlaces);
-        $includeNetWorth                                              = 1 === (int) ($account->meta['include_net_worth'] ?? 0);
+        $openingBalanceRounded                                        = Steam::bcround($openingBalance, $decimalPlaces);
+        $includeNetWorth                                              = 1 === (int)($account->meta['include_net_worth'] ?? 0);
        $longitude                                                    = $account->meta['location']['longitude'] ?? null;
        $latitude                                                     = $account->meta['location']['latitude'] ?? null;
        $zoomLevel                                                    = $account->meta['location']['zoom_level'] ?? null;
@@ -112,8 +112,55 @@ class AccountTransformer extends AbstractTransformer
        $currentBalance                                               = Steam::bcround($finalBalance['balance'] ?? '0', $decimalPlaces);
        $nativeCurrentBalance                                         = $this->convertToNative ? Steam::bcround($finalBalance['native_balance'] ?? '0', $native->decimal_places) : null;

+        // set up balances array:
+        $balances                                                     = [];
+        $balances[]
+                                                                      = [
+                                                                          'type'                    => 'current',
+                                                                          'amount'                  => $currentBalance,
+                                                                          'currency_id'             => $account->meta['currency_id'] ?? null,
+                                                                          'currency_code'           => $account->meta['currency']?->code,
+                                                                          'currency_symbol'         => $account->meta['currency']?->symbol,
+                                                                          'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                                                                          'date'                    => $date->toAtomString(),
+                                                                      ];
+        if (null !== $nativeCurrentBalance) {
+            $balances[] = [
+                'type'                     => 'native_current',
+                'amount'                   => $nativeCurrentBalance,
+                'currency_id'              => $native instanceof TransactionCurrency ? (string)$native->id : null,
+                'currency_code'            => $native?->code,
+                'currency_symbol'          => $native?->symbol,
+                'ccurrency_decimal_places' => $native?->decimal_places,
+                'date'                     => $date->toAtomString(),
+
+            ];
+        }
+        if (null !== $openingBalance) {
+            $balances[] = [
+                'type'                    => 'opening',
+                'amount'                  => $openingBalanceRounded,
+                'currency_id'             => $account->meta['currency_id'] ?? null,
+                'currency_code'           => $account->meta['currency']?->code,
+                'currency_symbol'         => $account->meta['currency']?->symbol,
+                'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                'date'                    => $openingBalanceDate,
+            ];
+        }
+        if (null !== $account->virtual_balance) {
+            $balances[] = [
+                'type'                    => 'virtual',
+                'amount'                  => Steam::bcround($account->virtual_balance, $decimalPlaces),
+                'currency_id'             => $account->meta['currency_id'] ?? null,
+                'currency_code'           => $account->meta['currency']?->code,
+                'currency_symbol'         => $account->meta['currency']?->symbol,
+                'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                'date'                    => $date->toAtomString(),
+            ];
+        }
+
        return [
-            'id'                             => (string) $account->id,
+            'id'                             => (string)$account->id,
            'created_at'                     => $account->created_at->toAtomString(),
            'updated_at'                     => $account->updated_at->toAtomString(),
            'active'                         => $account->active,
@@ -125,7 +172,7 @@ class AccountTransformer extends AbstractTransformer
            'currency_code'                  => $account->meta['currency']?->code,
            'currency_symbol'                => $account->meta['currency']?->symbol,
            'currency_decimal_places'        => $account->meta['currency']?->decimal_places,
-            'native_currency_id'             => $native instanceof TransactionCurrency ? (string) $native->id : null,
+            'native_currency_id'             => $native instanceof TransactionCurrency ? (string)$native->id : null,
            'native_currency_code'           => $native?->code,
            'native_currency_symbol'         => $native?->symbol,
            'native_currency_decimal_places' => $native?->decimal_places,
@@ -140,7 +187,7 @@ class AccountTransformer extends AbstractTransformer
            'bic'                            => $account->meta['BIC'] ?? null,
            'virtual_balance'                => Steam::bcround($account->virtual_balance, $decimalPlaces),
            'native_virtual_balance'         => $this->convertToNative ? Steam::bcround($account->native_virtual_balance, $native->decimal_places) : null,
-            'opening_balance'                => $openingBalance,
+            'opening_balance'                => $openingBalanceRounded,
            'native_opening_balance'         => $nativeOpeningBalance,
            'opening_balance_date'           => $openingBalanceDate,
            'liability_type'                 => $liabilityType,
@@ -153,6 +200,7 @@ class AccountTransformer extends AbstractTransformer
            'latitude'                       => $latitude,
            'zoom_level'                     => $zoomLevel,
            'last_activity'                  => array_key_exists('last_activity', $account->meta) ? $account->meta['last_activity']->toAtomString() : null,
+            'balances'                       => $balances,
            'links'                          => [
                [
                    'rel' => 'self',
@@ -165,7 +213,7 @@ class AccountTransformer extends AbstractTransformer
    private function getAccountRole(Account $account, string $accountType): ?string
    {
        $accountRole = $account->meta['account_role'] ?? null;
-        if ('asset' !== $accountType || '' === (string) $accountRole) {
+        if ('asset' !== $accountType || '' === (string)$accountRole) {
            return null;
        }

@@ -201,7 +249,7 @@ class AccountTransformer extends AbstractTransformer
                }
                $monthlyPaymentDate = $object->toAtomString();
            }
-            if (10 !== strlen((string) $monthlyPaymentDate)) {
+            if (10 !== strlen((string)$monthlyPaymentDate)) {
                $monthlyPaymentDate = Carbon::parse($monthlyPaymentDate, config('app.timezone'))->toAtomString();
            }
        }
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@@ -32,8 +32,10 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Models\BillDateCalculator;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;

 /**
 * Class BillTransformer
@@ -150,11 +152,11 @@ class BillTransformer extends AbstractTransformer
            'id'                             => $bill->id,
            'created_at'                     => $bill->created_at->toAtomString(),
            'updated_at'                     => $bill->updated_at->toAtomString(),
-            'currency_id'                    => (string) $bill->transaction_currency_id,
+            'currency_id'                    => (string)$bill->transaction_currency_id,
            'currency_code'                  => $currency->code,
            'currency_symbol'                => $currency->symbol,
            'currency_decimal_places'        => $currency->decimal_places,
-            'native_currency_id'             => null === $default ? null : (string) $default->id,
+            'native_currency_id'             => null === $default ? null : (string)$default->id,
            'native_currency_code'           => $default?->code,
            'native_currency_symbol'         => $default?->symbol,
            'native_currency_decimal_places' => $default?->decimal_places,
@@ -171,7 +173,7 @@ class BillTransformer extends AbstractTransformer
            'active'                         => $bill->active,
            'order'                          => $bill->order,
            'notes'                          => $notes,
-            'object_group_id'                => null !== $objectGroupId ? (string) $objectGroupId : null,
+            'object_group_id'                => null !== $objectGroupId ? (string)$objectGroupId : null,
            'object_group_order'             => $objectGroupOrder,
            'object_group_title'             => $objectGroupTitle,

@@ -194,9 +196,9 @@ class BillTransformer extends AbstractTransformer
     */
    protected function paidData(Bill $bill): array
    {
-        app('log')->debug(sprintf('Now in paidData for bill #%d', $bill->id));
+        Log::debug(sprintf('Now in paidData for bill #%d', $bill->id));
        if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) {
-            app('log')->debug('parameters are NULL, return empty array');
+            Log::debug('parameters are NULL, return empty array');

            return [];
        }
@@ -217,27 +219,40 @@ class BillTransformer extends AbstractTransformer
        $searchStart->startOfDay();
        $searchEnd->endOfDay();

-        app('log')->debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
-        app('log')->debug(sprintf('Search parameters are: start: %s', $searchStart->format('Y-m-d')));
+        Log::debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
+        Log::debug(sprintf('Search parameters are: start: %s', $searchStart->format('Y-m-d')));

        // Get from database when bill was paid.
        $set          = $this->repository->getPaidDatesInRange($bill, $searchStart, $searchEnd);
-        app('log')->debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
+        Log::debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));

        // Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.
-        app('log')->debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
+        Log::debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
        $lastPaidDate = $this->lastPaidDate($set, $start);
-        app('log')->debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));
+        Log::debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));

        // At this point the "next match" is exactly after the last time the bill was paid.
        $result       = [];
        foreach ($set as $entry) {
-            $result[] = [
-                'transaction_group_id'   => (string) $entry->transaction_group_id,
-                'transaction_journal_id' => (string) $entry->id,
-                'date'                   => $entry->date->format('Y-m-d'),
-                'date_object'            => $entry->date,
+            $array    = [
+                'transaction_group_id'             => (string)$entry->transaction_group_id,
+                'transaction_journal_id'           => (string)$entry->id,
+                'date'                             => $entry->date->format('Y-m-d'),
+                'date_object'                      => $entry->date,
+                'currency_id'                      => $entry->transaction_currency_id,
+                'currency_code'                    => $entry->transaction_currency_code,
+                'currency_decimal_places'          => $entry->transaction_currency_decimal_places,
+                'amount'                           => Steam::bcround($entry->amount, $entry->transaction_currency_decimal_places),
            ];
+            if (null !== $entry->foreign_amount && null !== $entry->foreign_currency_code) {
+                $array['foreign_currency_id']             = $entry->foreign_currency_id;
+                $array['foreign_currency_code']           = $entry->foreign_currency_code;
+                $array['foreign_currency_decimal_places'] = $entry->foreign_currency_decimal_places;
+                $array['foreign_amount']                  = Steam::bcround($entry->foreign_amount, $entry->foreign_currency_decimal_places);
+            }
+
+            $result[] = $array;
+
        }

        return $result;
@@ -265,7 +280,7 @@ class BillTransformer extends AbstractTransformer

    private function getLastPaidDate(array $paidData): ?Carbon
    {
-        app('log')->debug('getLastPaidDate()');
+        Log::debug('getLastPaidDate()');
        $return = null;
        foreach ($paidData as $entry) {
            if (null !== $return) {
@@ -274,15 +289,15 @@ class BillTransformer extends AbstractTransformer
                if ($current->gt($return)) {
                    $return = clone $current;
                }
-                app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
            }
            if (null === $return) {
                /** @var Carbon $return */
                $return = $entry['date_object'];
-                app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
            }
        }
-        app('log')->debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d')));
+        Log::debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d')));

        return $return;
    }
--- a/app/Transformers/TransactionGroupTransformer.php
+++ b/app/Transformers/TransactionGroupTransformer.php
@@ -121,6 +121,15 @@ class TransactionGroupTransformer extends AbstractTransformer
        if (null !== $transaction['foreign_amount'] && '' !== $transaction['foreign_amount'] && 0 !== bccomp('0', (string) $transaction['foreign_amount'])) {
            $foreignAmount = app('steam')->positive($transaction['foreign_amount']);
        }
+
+        // set native amount to the normal amount if the currency matches.
+        if ($transaction['native_currency']['id'] ?? null === $transaction['currency_id']) {
+            $transaction['native_amount'] = $amount;
+        }
+
+        if (array_key_exists('native_amount', $transaction) && null !== $transaction['native_amount']) {
+            $transaction['native_amount'] = app('steam')->positive($transaction['native_amount']);
+        }
        $type            = $this->stringFromArray($transaction, 'transaction_type_type', TransactionTypeEnum::WITHDRAWAL->value);

        // must be 0 (int) or NULL
--- a/composer.lock
+++ b/composer.lock
@@ -1879,16 +1879,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.20.0",
+            "version": "v12.21.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff"
+                "reference": "ac8c4e73bf1b5387b709f7736d41427e6af1c93b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1b9a00f8caf5503c92aa436279172beae1a484ff",
-                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ac8c4e73bf1b5387b709f7736d41427e6af1c93b",
+                "reference": "ac8c4e73bf1b5387b709f7736d41427e6af1c93b",
                "shasum": ""
            },
            "require": {
@@ -2090,7 +2090,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-07-08T15:02:21+00:00"
+            "time": "2025-07-22T15:41:55+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2229,16 +2229,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.1.2",
+            "version": "v4.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491"
+                "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
-                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/fd6df4f79f48a72992e8d29a9c0ee25422a0d677",
+                "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677",
                "shasum": ""
            },
            "require": {
@@ -2289,7 +2289,7 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2025-07-01T15:49:32+00:00"
+            "time": "2025-07-09T19:45:24+00:00"
        },
        {
            "name": "laravel/serializable-closure",
@@ -2619,16 +2619,16 @@
        },
        {
            "name": "league/commonmark",
-            "version": "2.7.0",
+            "version": "2.7.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca",
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca",
                "shasum": ""
            },
            "require": {
@@ -2657,7 +2657,7 @@
                "symfony/process": "^5.4 | ^6.0 | ^7.0",
                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                "unleashedtech/php-coding-standard": "^3.1.1",
-                "vimeo/psalm": "^4.24.0 || ^5.0.0"
+                "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
            },
            "suggest": {
                "symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -2722,7 +2722,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-05-05T12:20:28+00:00"
+            "time": "2025-07-20T12:47:49+00:00"
        },
        {
            "name": "league/config",
@@ -5101,16 +5101,16 @@
        },
        {
            "name": "predis/predis",
-            "version": "v3.0.1",
+            "version": "v3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/predis/predis.git",
-                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf"
+                "reference": "202e0c5322b906ec4c761c0cefebad6d0959a699"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
-                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
+                "url": "https://api.github.com/repos/predis/predis/zipball/202e0c5322b906ec4c761c0cefebad6d0959a699",
+                "reference": "202e0c5322b906ec4c761c0cefebad6d0959a699",
                "shasum": ""
            },
            "require": {
@@ -5152,7 +5152,7 @@
            ],
            "support": {
                "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v3.0.1"
+                "source": "https://github.com/predis/predis/tree/v3.1.0"
            },
            "funding": [
                {
@@ -5160,7 +5160,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-05-16T18:30:32+00:00"
+            "time": "2025-07-22T15:37:44+00:00"
        },
        {
            "name": "psr/cache",
@@ -9840,16 +9840,16 @@
    "packages-dev": [
        {
            "name": "barryvdh/laravel-debugbar",
-            "version": "v3.15.4",
+            "version": "v3.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106"
+                "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c0667ea91f7185f1e074402c5788195e96bf8106",
-                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/f265cf5e38577d42311f1a90d619bcd3740bea23",
+                "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23",
                "shasum": ""
            },
            "require": {
@@ -9857,7 +9857,7 @@
                "illuminate/session": "^9|^10|^11|^12",
                "illuminate/support": "^9|^10|^11|^12",
                "php": "^8.1",
-                "php-debugbar/php-debugbar": "~2.1.1",
+                "php-debugbar/php-debugbar": "~2.2.0",
                "symfony/finder": "^6|^7"
            },
            "require-dev": {
@@ -9877,7 +9877,7 @@
                    ]
                },
                "branch-alias": {
-                    "dev-master": "3.15-dev"
+                    "dev-master": "3.16-dev"
                }
            },
            "autoload": {
@@ -9909,7 +9909,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.4"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.0"
            },
            "funding": [
                {
@@ -9921,24 +9921,24 @@
                    "type": "github"
                }
            ],
-            "time": "2025-04-16T06:32:06+00:00"
+            "time": "2025-07-14T11:56:43+00:00"
        },
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.5.5",
+            "version": "v3.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "8d441ec99f8612b942b55f5183151d91591b618a"
+                "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d441ec99f8612b942b55f5183151d91591b618a",
-                "reference": "8d441ec99f8612b942b55f5183151d91591b618a",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8d00250cba25728373e92c1d8dcebcbf64623d29",
+                "reference": "8d00250cba25728373e92c1d8dcebcbf64623d29",
                "shasum": ""
            },
            "require": {
-                "barryvdh/reflection-docblock": "^2.3",
+                "barryvdh/reflection-docblock": "^2.4",
                "composer/class-map-generator": "^1.0",
                "ext-json": "*",
                "illuminate/console": "^11.15 || ^12",
@@ -10003,7 +10003,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.5.5"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.6.0"
            },
            "funding": [
                {
@@ -10015,20 +10015,20 @@
                    "type": "github"
                }
            ],
-            "time": "2025-02-11T13:59:46+00:00"
+            "time": "2025-07-17T20:11:57+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
-            "version": "v2.3.1",
+            "version": "v2.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/ReflectionDocBlock.git",
-                "reference": "b6ff9f93603561f50e53b64310495d20b8dff5d8"
+                "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/b6ff9f93603561f50e53b64310495d20b8dff5d8",
-                "reference": "b6ff9f93603561f50e53b64310495d20b8dff5d8",
+                "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/d103774cbe7e94ddee7e4870f97f727b43fe7201",
+                "reference": "d103774cbe7e94ddee7e4870f97f727b43fe7201",
                "shasum": ""
            },
            "require": {
@@ -10065,9 +10065,9 @@
                }
            ],
            "support": {
-                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.3.1"
+                "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.4.0"
            },
-            "time": "2025-01-18T19:26:32+00:00"
+            "time": "2025-07-17T06:07:30+00:00"
        },
        {
            "name": "cloudcreativity/json-api-testing",
@@ -10471,16 +10471,16 @@
        },
        {
            "name": "larastan/larastan",
-            "version": "v3.5.0",
+            "version": "v3.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/larastan/larastan.git",
-                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce"
+                "reference": "6431d010dd383a9279eb8874a76ddb571738564a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/e8ccd73008487ba91da9877b373f8c447743f1ce",
-                "reference": "e8ccd73008487ba91da9877b373f8c447743f1ce",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/6431d010dd383a9279eb8874a76ddb571738564a",
+                "reference": "6431d010dd383a9279eb8874a76ddb571738564a",
                "shasum": ""
            },
            "require": {
@@ -10548,7 +10548,7 @@
            ],
            "support": {
                "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.5.0"
+                "source": "https://github.com/larastan/larastan/tree/v3.6.0"
            },
            "funding": [
                {
@@ -10556,7 +10556,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-19T22:41:50+00:00"
+            "time": "2025-07-11T06:52:52+00:00"
        },
        {
            "name": "laravel-json-api/testing",
@@ -10768,16 +10768,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.5.0",
+            "version": "v5.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
-                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
+                "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
                "shasum": ""
            },
            "require": {
@@ -10820,9 +10820,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
            },
-            "time": "2025-05-31T08:24:38+00:00"
+            "time": "2025-07-27T20:03:57+00:00"
        },
        {
            "name": "phar-io/manifest",
@@ -10944,16 +10944,16 @@
        },
        {
            "name": "php-debugbar/php-debugbar",
-            "version": "v2.1.6",
+            "version": "v2.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0"
+                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/16fa68da5617220594aa5e33fa9de415f94784a0",
-                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
+                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
                "shasum": ""
            },
            "require": {
@@ -10961,6 +10961,9 @@
                "psr/log": "^1|^2|^3",
                "symfony/var-dumper": "^4|^5|^6|^7"
            },
+            "replace": {
+                "maximebf/debugbar": "self.version"
+            },
            "require-dev": {
                "dbrekelmans/bdi": "^1",
                "phpunit/phpunit": "^8|^9",
@@ -10975,7 +10978,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                }
            },
            "autoload": {
@@ -11008,9 +11011,9 @@
            ],
            "support": {
                "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.1.6"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4"
            },
-            "time": "2025-02-21T17:47:03+00:00"
+            "time": "2025-07-22T14:01:30+00:00"
        },
        {
            "name": "phpstan/extension-installer",
@@ -11062,16 +11065,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.17",
+            "version": "2.1.21",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053"
+                "reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/89b5ef665716fa2a52ecd2633f21007a6a349053",
-                "reference": "89b5ef665716fa2a52ecd2633f21007a6a349053",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ccf445757458c06a04eb3f803603cb118fe5fa6",
+                "reference": "1ccf445757458c06a04eb3f803603cb118fe5fa6",
                "shasum": ""
            },
            "require": {
@@ -11116,7 +11119,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-05-21T20:55:28+00:00"
+            "time": "2025-07-28T19:35:08+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
@@ -11167,16 +11170,16 @@
        },
        {
            "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.4",
+            "version": "2.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
+                "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f9f77efa9de31992a832ff77ea52eb42d675b094",
+                "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094",
                "shasum": ""
            },
            "require": {
@@ -11209,22 +11212,22 @@
            "description": "Extra strict and opinionated rules for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.4"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.6"
            },
-            "time": "2025-03-18T11:42:40+00:00"
+            "time": "2025-07-21T12:19:29+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "12.3.1",
+            "version": "12.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ddec29dfc128eba9c204389960f2063f3b7fa170"
+                "reference": "086553c5b2e0e1e20293d782d788ab768202b621"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ddec29dfc128eba9c204389960f2063f3b7fa170",
-                "reference": "ddec29dfc128eba9c204389960f2063f3b7fa170",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/086553c5b2e0e1e20293d782d788ab768202b621",
+                "reference": "086553c5b2e0e1e20293d782d788ab768202b621",
                "shasum": ""
            },
            "require": {
@@ -11280,7 +11283,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.1"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.2"
            },
            "funding": [
                {
@@ -11300,7 +11303,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-06-18T08:58:13+00:00"
+            "time": "2025-07-29T06:19:24+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -11549,16 +11552,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.2.7",
+            "version": "12.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8b1348b254e5959acaf1539c6bd790515fb49414"
+                "reference": "49dc7c0669b97c7a36f63411635f48eedc140eb4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8b1348b254e5959acaf1539c6bd790515fb49414",
-                "reference": "8b1348b254e5959acaf1539c6bd790515fb49414",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49dc7c0669b97c7a36f63411635f48eedc140eb4",
+                "reference": "49dc7c0669b97c7a36f63411635f48eedc140eb4",
                "shasum": ""
            },
            "require": {
@@ -11572,7 +11575,7 @@
                "phar-io/manifest": "^2.0.4",
                "phar-io/version": "^3.2.1",
                "php": ">=8.3",
-                "phpunit/php-code-coverage": "^12.3.1",
+                "phpunit/php-code-coverage": "^12.3.2",
                "phpunit/php-file-iterator": "^6.0.0",
                "phpunit/php-invoker": "^6.0.0",
                "phpunit/php-text-template": "^5.0.0",
@@ -11626,7 +11629,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.7"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.8"
            },
            "funding": [
                {
@@ -11650,25 +11653,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-11T04:11:13+00:00"
+            "time": "2025-07-30T05:58:18+00:00"
        },
        {
            "name": "rector/rector",
-            "version": "2.1.1",
+            "version": "2.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d0917c069bb0d9bb06ed111cf052510f609015a4"
+                "reference": "40a71441dd73fa150a66102f5ca1364c44fc8fff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d0917c069bb0d9bb06ed111cf052510f609015a4",
-                "reference": "d0917c069bb0d9bb06ed111cf052510f609015a4",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/40a71441dd73fa150a66102f5ca1364c44fc8fff",
+                "reference": "40a71441dd73fa150a66102f5ca1364c44fc8fff",
                "shasum": ""
            },
            "require": {
                "php": "^7.4|^8.0",
-                "phpstan/phpstan": "^2.1.17"
+                "phpstan/phpstan": "^2.1.18"
            },
            "conflict": {
                "rector/rector-doctrine": "*",
@@ -11702,7 +11705,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.1.1"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.2"
            },
            "funding": [
                {
@@ -11710,7 +11713,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-07-10T11:31:31+00:00"
+            "time": "2025-07-17T19:30:06+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-07-17',
-    'build_time'                   => 1752727208,
+    'version'                      => 'develop/2025-07-30',
+    'build_time'                   => 1753858473,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 26,

--- a/config/translations.php
+++ b/config/translations.php
@@ -65,6 +65,7 @@ return [
                'interest_calc_half-year',
                'interest_calc_quarterly',
                'spent',
+                'budgeted',
                'administration_owner',
                'administration_you',
                'administration_role_owner',
--- a/package-lock.json
+++ b/package-lock.json
--- a/resources/assets/v1/package.json
+++ b/resources/assets/v1/package.json
@@ -16,9 +16,9 @@
    "devDependencies": {
        "@johmun/vue-tags-input": "^2",
        "@vue/compiler-sfc": "^3.5.11",
-        "axios": "^1.8",
+        "axios": "^1.11",
        "bootstrap-sass": "^3",
-        "cross-env": "^7.0",
+        "cross-env": "^10.0",
        "font-awesome": "^4.7.0",
        "jquery": "^3",
        "laravel-mix": "^6.0",
--- a/resources/assets/v1/src/locales/cs.json
+++ b/resources/assets/v1/src/locales/cs.json
@@ -1,11 +1,11 @@
 {
    "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
+        "administrations_page_title": "Spr\u00e1va financ\u00ed",
+        "administrations_index_menu": "Spr\u00e1va financ\u00ed",
        "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "temp_administrations_introduction": "Firefly III brzy z\u00edsk\u00e1 mo\u017enost spravovat v\u00edce spr\u00e1v financ\u00ed. Moment\u00e1ln\u011b m\u00e1te pouze jednu. M\u016f\u017eete nastavit n\u00e1zev t\u00e9to spr\u00e1vy a jej\u00ed m\u00edstn\u00ed m\u011bnu. Toto nahrazuje p\u0159edchoz\u00ed nastaven\u00ed, kde jste nastavovali \u201ev\u00fdchoz\u00ed m\u011bnu\u201c. Toto nastaven\u00ed je nyn\u00ed v\u00e1z\u00e1no na spr\u00e1vu financ\u00ed a m\u016f\u017ee se li\u0161it pro ka\u017edou spr\u00e1vu.",
+        "administration_currency_form_help": "Pokud zm\u011bn\u00edte m\u00edstn\u00ed m\u011bnu, m\u016f\u017ee na\u010dten\u00ed str\u00e1nky trvat d\u00e9le, proto\u017ee transakce mo\u017en\u00e1 bude pot\u0159eba p\u0159ev\u00e9st na va\u0161i (novou) m\u00edstn\u00ed m\u011bnu.",
+        "administrations_page_edit_sub_title_js": "Upravit spr\u00e1vu financ\u00ed \u201e{title}\u201c",
        "table": "Tabulka",
        "welcome_back": "Jak to jde?",
        "flash_error": "Chyba!",
@@ -20,14 +20,14 @@
        "split": "Rozd\u011blit",
        "single_split": "Rozd\u011blit",
        "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies_enabled": "Pokud m\u00e1te povolenou pouze jednu m\u011bnu, nemus\u00edte p\u0159id\u00e1vat sm\u011bnn\u00e9 kurzy.",
        "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakce #{ID} (\"{title}\")<\/a> byla ulo\u017eena.",
        "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> byl ulo\u017een.",
        "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") byl aktualizov\u00e1n.",
        "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") has been updated.",
        "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakce #{ID}<\/a> byla ulo\u017eena.",
        "transaction_journal_information": "Informace o transakci",
-        "submission_options": "Submission options",
+        "submission_options": "Mo\u017enosti polo\u017eky",
        "apply_rules_checkbox": "Aplikovat pravidla",
        "fire_webhooks_checkbox": "Spustit webhooky",
        "no_budget_pointer": "<a href=\"budgets\">Zde<\/a> si m\u016f\u017eete spravovat rozpo\u010dty, kter\u00e9 v\u00e1m mohou pomoci sledovat v\u00fddaje.",
@@ -36,7 +36,7 @@
        "hidden_fields_preferences": "Dal\u0161\u00ed vlastnosti transakc\u00ed m\u016f\u017eete zaznamenat kdy\u017e je zapnete v <a href=\"preferences\">nastaven\u00ed<\/a>.",
        "destination_account": "C\u00edlov\u00fd \u00fa\u010det",
        "add_another_split": "P\u0159idat dal\u0161\u00ed roz\u00fa\u010dtov\u00e1n\u00ed",
-        "submission": "Submission",
+        "submission": "Polo\u017eka",
        "stored_journal": "\u00dasp\u011b\u0161n\u011b vytvo\u0159ena nov\u00e1 transakce \u201e:description\u201c",
        "create_another": "Po ulo\u017een\u00ed se vr\u00e1tit sem pro vytvo\u0159en\u00ed dal\u0161\u00ed.",
        "reset_after": "Po odesl\u00e1n\u00ed vymazat obsah formul\u00e1\u0159e",
@@ -75,24 +75,24 @@
        "profile_oauth_clients": "Klienti OAuth",
        "profile_oauth_no_clients": "Zat\u00edm jste nevytvo\u0159ili OAuth klienty.",
        "profile_oauth_clients_header": "Klienti",
-        "profile_oauth_client_id": "ID z\u00e1kazn\u00edka",
+        "profile_oauth_client_id": "ID klienta",
        "profile_oauth_client_name": "Jm\u00e9no",
-        "profile_oauth_client_secret": "Tajn\u00fd kl\u00ed\u010d",
+        "profile_oauth_client_secret": "Tajn\u00e9",
        "profile_oauth_create_new_client": "Vytvo\u0159it nov\u00e9ho klienta",
        "profile_oauth_create_client": "Vytvo\u0159it klienta",
        "profile_oauth_edit_client": "Upravit klienta",
        "profile_oauth_name_help": "N\u011bco \u010demu va\u0161i u\u017eivatel\u00e9 budou d\u016fv\u011b\u0159ovat.",
        "profile_oauth_redirect_url": "P\u0159esm\u011brovat URL adresu",
-        "profile_oauth_clients_external_auth": "Pokud pro ov\u011b\u0159ov\u00e1n\u00ed pou\u017e\u00edv\u00e1te extern\u00ed slu\u017ebu, nap\u0159\u00edklad Authelia, OAuth klienti nemus\u00ed fungovat spr\u00e1vn\u011b. M\u00edsto toho m\u016f\u017eete pou\u017e\u00edt Personal Access Token.",
+        "profile_oauth_clients_external_auth": "Pokud pro ov\u011b\u0159ov\u00e1n\u00ed pou\u017e\u00edv\u00e1te extern\u00ed slu\u017ebu, nap\u0159\u00edklad Authelia, OAuth klienti nemus\u00ed fungovat spr\u00e1vn\u011b. M\u00edsto toho m\u016f\u017eete pou\u017e\u00edt osobn\u00ed p\u0159\u00edstupov\u00fd token.",
        "profile_oauth_redirect_url_help": "Callback URL va\u0161\u00ed aplikace.",
        "profile_authorized_apps": "Authorized applications",
        "profile_authorized_clients": "Autorizovan\u00ed klienti",
        "profile_scopes": "Scopes",
        "profile_revoke": "Revoke",
-        "profile_personal_access_tokens": "Personal Access Token",
-        "profile_personal_access_token": "Personal Access Token",
-        "profile_personal_access_token_explanation": "Tohle je v\u00e1\u0161 nov\u00fd p\u0159\u00edstupov\u00fd token. Tohle je naposled kdy ho vid\u00edte, tak\u017ee ho neztra\u0165te! M\u016f\u017eete ho pou\u017e\u00edt pro vol\u00e1n\u00ed API.",
-        "profile_no_personal_access_token": "Je\u0161t\u011b jste nevytvo\u0159ili \u017e\u00e1dn\u00e9 p\u0159\u00edstupov\u00e9 tokeny.",
+        "profile_personal_access_tokens": "Osobn\u00ed p\u0159\u00edstupov\u00fd token",
+        "profile_personal_access_token": "Osobn\u00ed p\u0159\u00edstupov\u00e9 tokeny",
+        "profile_personal_access_token_explanation": "Zde je v\u00e1\u0161 nov\u00fd osobn\u00ed p\u0159\u00edstupov\u00fd token. Toto je jedin\u00fd okam\u017eik, kdy jej uvid\u00edte, tak\u017ee ho neztra\u0165te! Nyn\u00ed m\u016f\u017eete tento token pou\u017e\u00edt k odes\u00edl\u00e1n\u00ed po\u017eadavk\u016f na API.",
+        "profile_no_personal_access_token": "Zat\u00edm jste nevytvo\u0159ili \u017e\u00e1dn\u00e9 osobn\u00ed p\u0159\u00edstupov\u00e9 tokeny.",
        "profile_create_new_token": "Vytvo\u0159it nov\u00fd token",
        "profile_create_token": "Vytvo\u0159it token",
        "profile_create": "Vytvo\u0159it",
@@ -140,12 +140,12 @@
        "response": "Odpov\u011b\u010f",
        "visit_webhook_url": "Nav\u0161t\u00edvit URL webhooku",
        "reset_webhook_secret": "Restartovat tajn\u00fd kl\u00ed\u010d webhooku",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
+        "header_exchange_rates": "Sm\u011bnn\u00e9 kurzy",
+        "exchange_rates_intro": "Firefly III podporuje stahov\u00e1n\u00ed a pou\u017e\u00edv\u00e1n\u00ed sm\u011bnn\u00fdch kurz\u016f. V\u00edce informac\u00ed o t\u00e9to funkci najdete <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">v dokumentaci<\/a>.",
+        "exchange_rates_from_to": "Mezi {from} a {to} (a opa\u010dn\u011b)",
+        "exchange_rates_intro_rates": "Firefly III pou\u017e\u00edv\u00e1 n\u00e1sleduj\u00edc\u00ed sm\u011bnn\u00e9 kurzy. Inverzn\u00ed kurz je automaticky vypo\u010d\u00edt\u00e1n, pokud nen\u00ed zad\u00e1n. Pokud pro datum transakce neexistuje sm\u011bnn\u00fd kurz, Firefly III se vr\u00e1t\u00ed zp\u011bt v \u010dase a pokus\u00ed se n\u011bjak\u00fd naj\u00edt. Pokud \u017e\u00e1dn\u00fd nenajde, pou\u017eije se kurz \u201e1\u201c.",
+        "header_exchange_rates_rates": "Sm\u011bnn\u00e9 kurzy",
+        "header_exchange_rates_table": "Tabulka se sm\u011bnn\u00fdmi kurzy",
        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
        "add_new_rate": "Add a new exchange rate",
        "save_new_rate": "Save new rate"
@@ -154,7 +154,7 @@
        "url": "URL",
        "active": "Aktivn\u00ed",
        "interest_date": "\u00darokov\u00e9 datum",
-        "administration_currency": "Native currency",
+        "administration_currency": "M\u00edstn\u00ed m\u011bna",
        "title": "N\u00e1zev",
        "date": "Datum",
        "book_date": "Datum rezervace",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -16,7 +16,7 @@
        "vite-plugin-manifest-sri": "^0.2.0"
    },
    "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.4.0",
+        "@fortawesome/fontawesome-free": "^7",
        "@popperjs/core": "^2.11.8",
        "admin-lte": "^4.0.0-rc4",
        "alpinejs": "^3.13.7",
--- a/resources/assets/v2/src/api/v1/chart/account/dashboard.js
+++ b/resources/assets/v2/src/api/v1/chart/account/dashboard.js
@@ -25,7 +25,7 @@ export default class Dashboard {
    dashboard(start, end) {
        let startStr = format(start, 'y-MM-dd');
        let endStr = format(end, 'y-MM-dd');
-        return api.get('/api/v1/chart/account/dashboard', {params: {fix: true, start: startStr, end: endStr}});
+        return api.get('/api/v1/chart/account/dashboard', {params: {start: startStr, end: endStr}});
    }

    expense(start, end) {
--- a/resources/assets/v2/src/boot/bootstrap.js
+++ b/resources/assets/v2/src/boot/bootstrap.js
@@ -48,6 +48,10 @@ window.bootstrap = bootstrap;

 // always grab the preference "marker" from Firefly III.
 getFreshVariable('lastActivity').then((serverValue) => {
+    if(null === serverValue) {
+        console.log('Server value is null in getFreshVariable.');
+        throw new Error('401 in getFreshVariable.');
+    }
    const localValue = store.get('lastActivity');
    store.set('cacheValid', localValue === serverValue);
    store.set('lastActivity', serverValue);
@@ -78,6 +82,8 @@ getFreshVariable('lastActivity').then((serverValue) => {
            window.bootstrapped = true;
        });
    });
+}).catch((error) => {
+    console.error('Error while bootstrapping: ' + error);
 });
 window.axios = axios;
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
--- a/resources/assets/v2/src/css/grid-ff3-theme.css
+++ b/resources/assets/v2/src/css/grid-ff3-theme.css
@@ -30,3 +30,4 @@
    border:0;
 }

+.skip-links {display: none;}
--- a/resources/assets/v2/src/pages/accounts/index.js
+++ b/resources/assets/v2/src/pages/accounts/index.js
@@ -315,7 +315,7 @@ let index = function () {
            // need to find the input thing
            console.log('Clicked edit button for account on index #' + index + ' and field ' + fieldName);
            const querySelector = 'input[data-field="' + fieldName + '"][data-index="' + index + '"]';
-            console.log(querySelector);
+            // console.log(querySelector);
            const newValue = document.querySelectorAll(querySelector)[0].value ?? '';
            if ('' === newValue) {
                return;
@@ -352,12 +352,15 @@ let index = function () {

            // filter instructions
            let filters = {};
+            let type = this.filters.type;
+            let active = this.filters.active;
            for (let k in this.filters) {
                if (this.filters.hasOwnProperty(k) && null !== this.filters[k]) {
                    filters[k] = this.filters[k];
                    //filters.push({column: k, filter: this.filters[k]});
                }
            }
+            delete filters.type;

            // get start and end from the store:
            const start = new Date(window.store.get('start'));
@@ -367,24 +370,23 @@ let index = function () {
            let params = {
                sort: sorting,
                filter: filters,
+                active: active,
                currentMoment: today,
-                // type: type,
-                page: {number: this.page},
+                type: type,
+                page: this.page,
                startPeriod: start,
                endPeriod: end
            };

            if (!this.tableColumns.balance_difference.enabled) {
                delete params.startPeriod;
-                delete params.enPeriod;
+                delete params.endPeriod;
            }
            this.accounts = [];
            let groupedAccounts = {};
            // one page only.o
            (new Get()).index(params).then(response => {
-                console.log(response);
                this.totalPages = response.meta.pagination.total_pages;
-                console.log('a');
                for (let i = 0; i < response.data.length; i++) {
                    if (response.data.hasOwnProperty(i)) {
                        let current = response.data[i];
@@ -399,18 +401,14 @@ let index = function () {
                            account_number: null === current.attributes.account_number ? '' : current.attributes.account_number,
                            current_balance: current.attributes.current_balance,
                            currency_code: current.attributes.currency_code,
-                            //native_current_balance: current.attributes.native_current_balance,
-                            //native_currency_code: current.attributes.native_currency_code,
                            last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
-                            //balance_difference: current.attributes.balance_difference,
-                            //native_balance_difference: current.attributes.native_balance_difference,
                            liability_type: current.attributes.liability_type,
                            liability_direction: current.attributes.liability_direction,
                            interest: current.attributes.interest,
                            interest_period: current.attributes.interest_period,
-                            //current_debt: current.attributes.current_debt,
                            balance: current.attributes.balance,
                            native_balance: current.attributes.native_balance,
+                            balances: current.attributes.balances,
                        };
                        // get group info:
                        let groupId = current.attributes.object_group_id;
--- a/resources/assets/v2/src/pages/dashboard/accounts.js
+++ b/resources/assets/v2/src/pages/dashboard/accounts.js
@@ -40,24 +40,33 @@ export default () => ({
    loadingAccounts: false,
    accountList: [],
    convertToNative: false,
-    convertToNativeAvailable: false,
    chartOptions: null,
-    switchConvertToNative() {
-        this.convertToNative = !this.convertToNative;
-        setVariable('convertToNative', this.convertToNative);
-    },
    localCacheKey(type) {
        return 'ds_accounts_' + type;
    },
+
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            console.log('I heard that! (dashboard/accounts)');
+            this.convertToNative = event.detail;
+            this.accountList = [];
+            chartData = null;
+            this.loadChart();
+            this.loadAccounts();
+        }
+    },
+
+
    getFreshData() {
        const start = new Date(window.store.get('start'));
        const end = new Date(window.store.get('end'));
-        const chartCacheKey = getCacheKey(this.localCacheKey('chart'), {start: start, end: end})
+        const chartCacheKey = getCacheKey(this.localCacheKey('chart'), {convertToNative: this.convertToNative, start: start, end: end})

        const cacheValid = window.store.get('cacheValid');
        let cachedData = window.store.get(chartCacheKey);

        if (cacheValid && typeof cachedData !== 'undefined') {
+            console.log('Generate from cache: ', chartCacheKey);
            this.drawChart(this.generateOptions(cachedData));
            this.loading = false;
            return;
@@ -67,6 +76,7 @@ export default () => ({
            this.chartData = response.data;
            // cache generated options:
            window.store.set(chartCacheKey, response.data);
+            console.log('Generate FRESH!');
            this.drawChart(this.generateOptions(this.chartData));
            this.loading = false;
        });
@@ -90,18 +100,23 @@ export default () => ({
                dataset.label = current.label;

                // use the "native" currency code and use the "native_entries" as array
-                // if (this.convertToNative) {
-                //     currencies.push(current.native_currency_code);
-                //     dataset.currency_code = current.native_currency_code;
-                //     collection = Object.values(current.native_entries);
-                //     yAxis = 'y' + current.native_currency_code;
-                // }
-                // if (!this.convertToNative) {
+                if (this.convertToNative) {
+                    currencies.push(current.native_currency_code);
+                    dataset.currency_code = current.native_currency_code;
+                    if(!current.hasOwnProperty('native_entries')) {
+                        console.error('No native entries ('+this.convertToNative+') found for account: ', current);
+                    }
+                    if(current.hasOwnProperty('native_entries')) {
+                        collection = Object.values(current.native_entries);
+                    }
+                    yAxis = 'y' + current.native_currency_code;
+                }
+                if (!this.convertToNative) {
                    yAxis = 'y' + current.currency_code;
                    dataset.currency_code = current.currency_code;
                    currencies.push(current.currency_code);
                    collection = Object.values(current.entries);
-                // }
+                }
                dataset.yAxisID = yAxis;
                dataset.data = collection;

@@ -196,6 +211,14 @@ export default () => ({
                    (new Get).show(accountId, new Date(window.store.get('end'))).then((response) => {
                        let parent = response.data.data;

+                        // apply function to each element of parent:
+                        parent.attributes.balances = parent.attributes.balances.map((balance) => {
+                            balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);
+                            return balance;
+                        });
+                        // console.log(parent);
+
+
                        // get groups for account:
                        const params = {
                            page: 1,
@@ -243,8 +266,7 @@ export default () => ({
                                name: parent.attributes.name,
                                order: parent.attributes.order,
                                id: parent.id,
-                                balance: parent.attributes.balance,
-                                //native_balance: parent.attributes.native_balance,
+                                balances: parent.attributes.balances,
                                groups: groups,
                            });
                            // console.log(parent.attributes);
@@ -266,13 +288,16 @@ export default () => ({

    init() {
        // console.log('accounts init');
-        Promise.all([getVariable('viewRange', '1M'), getVariable('convertToNative', false), getVariable('language', 'en_US'),
-            getConfiguration('cer.enabled', false)
+        Promise.all([
+            getVariable('viewRange', '1M'), // 0
+            getVariable('convert_to_native', false), // 1
+            getVariable('language', 'en_US'), // 2
+            getConfiguration('cer.enabled', false) // 3
        ]).then((values) => {
            //console.log('accounts after promises');
            this.convertToNative = values[1] && values[3];
-            this.convertToNativeAvailable = values[3];
            afterPromises = true;
+            //console.log('convertToNative in accounts.js: ', values);

            // main dashboard chart:
            this.loadChart();
@@ -289,7 +314,7 @@ export default () => ({
            this.loadChart();
            this.loadAccounts();
        });
-        window.store.observe('convertToNative', () => {
+        window.store.observe('convert_to_native', () => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/boxes.js
+++ b/resources/assets/v2/src/pages/dashboard/boxes.js
@@ -35,11 +35,21 @@ export default () => ({
    loading: false,
    boxData: null,
    boxOptions: null,
+    eventListeners: {
+        ['@convert-to-native.window'](event){
+            this.convertToNative = event.detail;
+            this.accountList = [];
+            console.log('I heard that! (dashboard/boxes)');
+            this.boxData = null;
+            this.loadBoxes();
+        }
+    },
+
    getFreshData() {
        const start = new Date(window.store.get('start'));
        const end = new Date(window.store.get('end'));
        // TODO cache key is hard coded, problem?
-        const boxesCacheKey = getCacheKey('ds_boxes_data', {start: start, end: end});
+        const boxesCacheKey = getCacheKey('ds_boxes_data', {convertToNative: this.convertToNative, start: start, end: end});
        cleanupCache();

        //const cacheValid = window.store.get('cacheValid');
@@ -76,7 +86,7 @@ export default () => ({
                    continue;
                }
                let key = current.key;
-                console.log('NOT NATIVE');
+                // console.log('NOT NATIVE');
                if (key.startsWith('balance-in-')) {
                    this.balanceBox.amounts.push(formatMoney(current.monetary_value, current.currency_code));
                    continue;
@@ -153,7 +163,7 @@ export default () => ({
    init() {
        // console.log('boxes init');
        // TODO can be replaced by "getVariables"
-        Promise.all([getVariable('viewRange'), getVariable('convertToNative', false)]).then((values) => {
+        Promise.all([getVariable('viewRange'), getVariable('convert_to_native', false)]).then((values) => {
            // console.log('boxes after promises');
            afterPromises = true;
            this.convertToNative = values[1];
@@ -167,7 +177,7 @@ export default () => ({
            this.boxData = null;
            this.loadBoxes();
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/budgets.js
+++ b/resources/assets/v2/src/pages/dashboard/budgets.js
@@ -60,7 +60,8 @@ export default () => ({
        const start = new Date(window.store.get('start'));
        const end = new Date(window.store.get('end'));
        const cacheKey = getCacheKey('ds_bdg_chart', {start: start, end: end});
-        const cacheValid = window.store.get('cacheValid');
+        //const cacheValid = window.store.get('cacheValid');
+        const cacheValid = false;
        let cachedData = window.store.get(cacheKey);

        if (cacheValid && typeof cachedData !== 'undefined') {
@@ -80,7 +81,7 @@ export default () => ({
    },
    generateOptions(data) {
        currencies = [];
-        let options = getDefaultChartSettings('column');
+        let options = getDefaultChartSettings('bar');
        options.options.locale = window.store.get('locale').replace('_', '-');
        options.options.plugins = {
            tooltip: {
@@ -94,7 +95,7 @@ export default () => ({
                        if (label) {
                            label += ': ';
                        }
-                        return label + ' ' + formatMoney(context.parsed.y, currencies[context.parsed.x] ?? 'EUR');
+                        return label + ' ' + formatMoney(context.parsed.x, currencies[context.parsed.x] ?? 'EUR');
                    }
                }
            }
@@ -103,28 +104,19 @@ export default () => ({
            labels: [],
            datasets: [
                {
+                    label: i18next.t('firefly.budgeted'),
+                    data: [],
+                    borderWidth: 1,
+                    backgroundColor: getColors('budgeted', 'background'),
+                    borderColor: getColors('budgeted', 'border'),
+                },
+                {
+                    //label: i18next.t('firefly.budgeted'),
                    label: i18next.t('firefly.spent'),
                    data: [],
                    borderWidth: 1,
-                    stack: 1,
                    backgroundColor: getColors('spent', 'background'),
                    borderColor: getColors('spent', 'border'),
-                },
-                {
-                    label: i18next.t('firefly.left'),
-                    data: [],
-                    borderWidth: 1,
-                    stack: 1,
-                    backgroundColor: getColors('left', 'background'),
-                    borderColor: getColors('left', 'border'),
-                },
-                {
-                    label: i18next.t('firefly.overspent'),
-                    data: [],
-                    borderWidth: 1,
-                    stack: 1,
-                    backgroundColor: getColors('overspent', 'background'),
-                    borderColor: getColors('overspent', 'border'),
                }
            ]
        };
@@ -134,24 +126,16 @@ export default () => ({
                //         // convert to EUR yes no?
                let label = current.label + ' (' + current.currency_code + ')';
                options.data.labels.push(label);
-                if (this.convertToNative) {
-                    currencies.push(current.native_currency_code);
-                    // series 0: spent
-                    options.data.datasets[0].data.push(parseFloat(current.native_entries.spent) * -1);
-                    // series 1: left
-                    options.data.datasets[1].data.push(parseFloat(current.native_entries.left));
-                    // series 2: overspent
-                    options.data.datasets[2].data.push(parseFloat(current.native_entries.overspent));
-                }
-                if (!this.convertToNative) {
-                    currencies.push(current.currency_code);
-                    // series 0: spent
-                    options.data.datasets[0].data.push(parseFloat(current.entries.spent) * -1);
-                    // series 1: left
-                    options.data.datasets[1].data.push(parseFloat(current.entries.left));
-                    // series 2: overspent
-                    options.data.datasets[2].data.push(parseFloat(current.entries.overspent));
-                }
+                // label = current.label + ' (' + current.currency_code + ') b';
+                // options.data.labels.push(label);
+
+                currencies.push(current.currency_code);
+                // series 0: budgeted
+                options.data.datasets[0].data.push(parseFloat(current.entries.budgeted));
+                // series 1: spent
+                options.data.datasets[1].data.push(parseFloat(current.entries.spent) * -1);
+                // series 2: overspent
+                // options.data.datasets[2].data.push(parseFloat(current.entries.overspent));
            }
        }
        // the currency format callback for the Y axis is AlWAYS based on whatever the first currency is.
@@ -160,9 +144,10 @@ export default () => ({
        options.options.scales = {
            y: {
                ticks: {
-                    callback: function (context) {
-                        return formatMoney(context, currencies[0] ?? 'EUR');
-                    }
+                    // callback: function (context) {
+                    //     return 'abc';
+                    //     return formatMoney(context, currencies[0] ?? 'EUR');
+                    // }
                }
            }
        };
@@ -172,7 +157,7 @@ export default () => ({


    init() {
-        Promise.all([getVariable('convertToNative', false)]).then((values) => {
+        Promise.all([getVariable('convert_to_native', false)]).then((values) => {
            this.convertToNative = values[0];
            afterPromises = true;
            if (false === this.loading) {
@@ -189,7 +174,7 @@ export default () => ({
                this.loadChart();
            }
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/categories.js
+++ b/resources/assets/v2/src/pages/dashboard/categories.js
@@ -183,7 +183,7 @@ export default () => ({
    },
    init() {
        // console.log('categories init');
-        Promise.all([getVariable('convertToNative', false),]).then((values) => {
+        Promise.all([getVariable('convert_to_native', false),]).then((values) => {
            this.convertToNative = values[0];
            afterPromises = true;
            this.loadChart();
@@ -195,7 +195,7 @@ export default () => ({
            this.chartData = null;
            this.loadChart();
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/dashboard.js
+++ b/resources/assets/v2/src/pages/dashboard/dashboard.js
@@ -46,7 +46,8 @@ import {
 } from "chart.js";
 import 'chartjs-adapter-date-fns';
 import {showInternalsButton} from "../../support/page-settings/show-internals-button.js";
-import {showWizardButton} from "../../support/page-settings/show-wizard-button.js";
+import {setVariable} from "../../store/set-variable.js";
+import {getVariable} from "../../store/get-variable.js";

 // register things
 Chart.register({
@@ -66,7 +67,25 @@ Chart.register({
    Legend
 });

+let index = function () {
+    return {
+        convertToNative: false,
+        saveNativeSettings(event) {
+            setVariable('convert_to_native', event.currentTarget.checked).then(() => {
+                console.log('Set convert to native to: ', event.currentTarget.checked);
+                this.$dispatch('convert-to-native', event.currentTarget.checked);
+            });
+        },
+        init() {
+            Promise.all([getVariable('convert_to_native', false)]).then((values) => {
+                this.convertToNative = values[0];
+            });
+        }
+    }
+};
+
 const comps = {
+    index,
    dates,
    boxes,
    accounts,
--- a/resources/assets/v2/src/pages/dashboard/piggies.js
+++ b/resources/assets/v2/src/pages/dashboard/piggies.js
@@ -129,7 +129,7 @@ export default () => ({
    init() {
        // console.log('piggies init');
        apiData = [];
-        Promise.all([getVariable('convertToNative', false)]).then((values) => {
+        Promise.all([getVariable('convert_to_native', false)]).then((values) => {

            afterPromises = true;
            this.convertToNative = values[0];
@@ -144,7 +144,7 @@ export default () => ({
            apiData = [];
            this.loadPiggyBanks();
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/sankey.js
+++ b/resources/assets/v2/src/pages/dashboard/sankey.js
@@ -94,6 +94,7 @@ function getObjectName(type, name, direction, code) {
    if ('category' === type && null === name && 'out' === direction) {
        return translations.unknown_category + ' (' + translations.out + (convertToNative ? ', ' + code + ')' : ')');
    }
+
    // account 4x
    if ('account' === type && null === name && 'in' === direction) {
        return translations.unknown_source + (convertToNative ? ' (' + code + ')' : '');
@@ -165,6 +166,11 @@ export default () => ({
                        // properties of the transaction, used in the generation of the chart:
                        let transaction = group.attributes.transactions[ii];
                        let currencyCode = this.convertToNative ? transaction.native_currency_code : transaction.currency_code;
+                        if(this.convertToNative && (!transaction.hasOwnProperty('native_amount') || null === transaction.native_amount)) {
+                            // skip this transaction, it has no native amount.
+                            console.error('No native amount for transaction #' + group.id + ' ('+this.convertToNative+')');
+                            continue;
+                        }
                        let amount = this.convertToNative ? parseFloat(transaction.native_amount) : parseFloat(transaction.amount);
                        let flowKey;

@@ -312,7 +318,7 @@ export default () => ({
    downloadTransactions(params) {
        const start = new Date(window.store.get('start'));
        const end = new Date(window.store.get('end'));
-        const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {start: start, end: end});
+        const cacheKey = getCacheKey(SANKEY_CACHE_KEY, {convertToNative: this.convertToNative, start: start, end: end});

        //console.log('Downloading page ' + params.page + '...');
        const getter = new Get();
@@ -348,9 +354,10 @@ export default () => ({
    init() {
        // console.log('sankey init');
        transactions = [];
-        Promise.all([getVariable('convertToNative', false)]).then((values) => {
+        Promise.all([getVariable('convert_to_native', false)]).then((values) => {
            this.convertToNative = values[0];
            convertToNative = values[0];
+
                // some translations:
                translations.all_money = i18next.t('firefly.all_money');
                translations.category = i18next.t('firefly.category');
@@ -378,7 +385,7 @@ export default () => ({
            this.transactions = [];
            this.loadChart();
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/dashboard/subscriptions.js
+++ b/resources/assets/v2/src/pages/dashboard/subscriptions.js
@@ -31,6 +31,99 @@ let afterPromises = false;
 let apiData = [];
 let subscriptionData = {};

+function addObjectGroupInfo(data) {
+    let objectGroupId = parseInt(data.object_group_id);
+    if (!subscriptionData.hasOwnProperty(objectGroupId)) {
+        subscriptionData[objectGroupId] = {
+            id: objectGroupId,
+            title: null === data.object_group_title ? i18next.t('firefly.default_group_title_name_plain') : data.object_group_title,
+            order: parseInt(data.object_group_order),
+            payment_info: {},
+            bills: [],
+        };
+    }
+}
+
+function parsePayDates(list) {
+    let newList = [];
+    for(let i in list) {
+        if (list.hasOwnProperty(i)) {
+            let current = list[i];
+            // convert to date object:
+            newList.push(new Date(current));
+        }
+    }
+    return newList;
+}
+
+function parseBillInfo(data) {
+    let result = {
+        id: data.id,
+        name: data.attributes.name,
+        amount_min: data.attributes.amount_min,
+        amount_max: data.attributes.amount_max,
+        amount: (parseFloat(data.attributes.amount_max) + parseFloat(data.attributes.amount_min)) / 2,
+        currency_code: data.attributes.currency_code,
+        // paid transactions:
+        transactions: [],
+        // unpaid moments
+        pay_dates: parsePayDates(data.attributes.pay_dates),
+        paid: data.attributes.paid_dates.length > 0,
+    };
+    // set variables
+    result.expected_amount = formatMoney(result.amount, result.currency_code);
+    result.expected_times = i18next.t('firefly.subscr_expected_x_times', {
+        times: data.attributes.pay_dates.length,
+        amount: result.expected_amount
+    });
+    // console.log(result);
+    return result;
+}
+
+function parsePaidTransactions(paid_dates, bill) {
+    if( !paid_dates || paid_dates.length < 1) {
+        return [];
+    }
+    let result = [];
+    // add transactions (simpler version)
+    for (let i in paid_dates) {
+        if (paid_dates.hasOwnProperty(i)) {
+            const currentPayment = paid_dates[i];
+            // console.log(currentPayment);
+            // math: -100+(paid/expected)*100
+            let percentage = Math.round(-100 + ((parseFloat(currentPayment.amount) ) / parseFloat(bill.amount)) * 100);
+            let currentTransaction = {
+                amount: formatMoney(currentPayment.amount, currentPayment.currency_code),
+                percentage: percentage,
+                date: format(new Date(currentPayment.date), 'PP'),
+                foreign_amount: null,
+            };
+            if (null !== currentPayment.foreign_currency_code) {
+                currentTransaction.foreign_amount =  currentPayment.foreign_amount;
+                currentTransaction.foreign_currency_code = currentPayment.foreign_currency_code;
+            }
+
+            result.push(currentTransaction);
+        }
+    }
+    return result;
+}
+
+function isInRange(bill) {
+    let start = new Date(window.store.get('start'));
+    let end = new Date(window.store.get('end'));
+    for(let i in bill.pay_dates) {
+        if (bill.pay_dates.hasOwnProperty(i)) {
+            let currentDate = bill.pay_dates[i];
+            //console.log(currentDate);
+            if (currentDate >= start && currentDate <= end) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 function downloadSubscriptions(params) {
    const getter = new Get();
    return getter.list(params)
@@ -41,83 +134,25 @@ function downloadSubscriptions(params) {
            for (let i in data) {
                if (data.hasOwnProperty(i)) {
                    let current = data[i];
-                    //console.log(current);
                    if (current.attributes.active && current.attributes.pay_dates.length > 0) {
-                        let objectGroupId = null === current.attributes.object_group_id ? 0 : current.attributes.object_group_id;
-                        let objectGroupTitle = null === current.attributes.object_group_title ? i18next.t('firefly.default_group_title_name_plain') : current.attributes.object_group_title;
-                        let objectGroupOrder = null === current.attributes.object_group_order ? 0 : current.attributes.object_group_order;
-                        if (!subscriptionData.hasOwnProperty(objectGroupId)) {
-                            subscriptionData[objectGroupId] = {
-                                id: objectGroupId,
-                                title: objectGroupTitle,
-                                order: objectGroupOrder,
-                                payment_info: {},
-                                bills: [],
-                            };
+                        // create or update object group
+                        let objectGroupId = parseInt(current.attributes.object_group_id);
+                        addObjectGroupInfo(current.attributes);
+
+                        // create and update the bill.
+                        let bill = parseBillInfo(current);
+
+                        // if not yet paid, and pay_dates is not in current rage, ignore it.
+                        if (false === bill.paid && !isInRange(bill)) {
+                            console.warn('Bill "'+bill.name+'" is not paid and not in range, ignoring: ');
+                            continue;
                        }
-                        // TODO this conversion needs to be inside some kind of a parsing class.
-                        let bill = {
-                            id: current.id,
-                            name: current.attributes.name,
-                            // amount
-                            amount_min: current.attributes.amount_min,
-                            amount_max: current.attributes.amount_max,
-                            amount: (parseFloat(current.attributes.amount_max) + parseFloat(current.attributes.amount_min)) / 2,
-                            currency_code: current.attributes.currency_code,

-                            // native amount
-                            // native_amount_min: current.attributes.native_amount_min,
-                            // native_amount_max: current.attributes.native_amount_max,
-                            // native_amount: (parseFloat(current.attributes.native_amount_max) + parseFloat(current.attributes.native_amount_min)) / 2,
-                            // native_currency_code: current.attributes.native_currency_code,

-                            // paid transactions:
-                            transactions: [],
-
-                            // unpaid moments
-                            pay_dates: current.attributes.pay_dates,
-                            paid: current.attributes.paid_dates.length > 0,
-                        };
-                        // set variables
-                        bill.expected_amount = formatMoney(bill.amount, bill.currency_code);
-                        bill.expected_times = i18next.t('firefly.subscr_expected_x_times', {
-                            times: current.attributes.pay_dates.length,
-                            amount: bill.expected_amount
-                        });
-
-                        // add transactions (simpler version)
-                        for (let iii in current.attributes.paid_dates) {
-                            if (current.attributes.paid_dates.hasOwnProperty(iii)) {
-                                const currentPayment = current.attributes.paid_dates[iii];
-                                let percentage = 100;
-                                // math: -100+(paid/expected)*100
-                                if (params.convertToNative) {
-                                    percentage = Math.round(-100 + ((parseFloat(currentPayment.native_amount) * -1) / parseFloat(bill.native_amount)) * 100);
-                                }
-                                if (!params.convertToNative) {
-                                    percentage = Math.round(-100 + ((parseFloat(currentPayment.amount) * -1) / parseFloat(bill.amount)) * 100);
-                                }
-                                // TODO fix me
-                                currentPayment.currency_code = 'EUR';
-                                console.log('Currency code: "'+currentPayment+'"');
-                                console.log(currentPayment);
-                                let currentTransaction = {
-                                    amount: formatMoney(currentPayment.amount, currentPayment.currency_code),
-                                    percentage: percentage,
-                                    date: format(new Date(currentPayment.date), 'PP'),
-                                    foreign_amount: null,
-                                };
-                                if (null !== currentPayment.foreign_currency_code) {
-                                    currentTransaction.foreign_amount =  currentPayment.foreign_amount;
-                                    currentTransaction.foreign_currency_code = currentPayment.foreign_currency_code;
-                                }
-
-                                bill.transactions.push(currentTransaction);
-                            }
-                        }
+                        bill.transactions = parsePaidTransactions(current.attributes.paid_dates, bill);

                        subscriptionData[objectGroupId].bills.push(bill);
-                        if (0 === current.attributes.paid_dates.length) {
+                        if (false === bill.paid) {
                            // bill is unpaid, count the "pay_dates" and multiply with the "amount".
                            // since bill is unpaid, this can only be in currency amount and native currency amount.
                            const totalAmount = current.attributes.pay_dates.length * bill.amount;
@@ -133,6 +168,7 @@ function downloadSubscriptions(params) {
                                    //native_unpaid: 0,
                                };
                            }
+
                            subscriptionData[objectGroupId].payment_info[bill.currency_code].unpaid += totalAmount;
                            //subscriptionData[objectGroupId].payment_info[bill.currency_code].native_unpaid += totalNativeAmount;
                        }
@@ -269,7 +305,7 @@ export default () => ({
    },

    init() {
-        Promise.all([getVariable('convertToNative', false)]).then((values) => {
+        Promise.all([getVariable('convert_to_native', false)]).then((values) => {
            this.convertToNative = values[0];
            afterPromises = true;

@@ -287,7 +323,7 @@ export default () => ({
                this.startSubscriptions();
            }
        });
-        window.store.observe('convertToNative', (newValue) => {
+        window.store.observe('convert_to_native', (newValue) => {
            if (!afterPromises) {
                return;
            }
--- a/resources/assets/v2/src/pages/transactions/index.js
+++ b/resources/assets/v2/src/pages/transactions/index.js
@@ -71,7 +71,7 @@ let index = function () {
        init() {
            // TODO need date range.
            // TODO handle page number
-            this.getTransactions(this.page);``
+            this.getTransactions(this.page);

            // Your Javascript code to create the grid
            // dataTable = createGrid(document.querySelector('#grid'), gridOptions);
--- a/resources/assets/v2/src/sass/adminlte-filtered.scss
+++ b/resources/assets/v2/src/sass/adminlte-filtered.scss
@@ -1,5 +1,5 @@
 /*!
- * adminlte-filteres.scss
+ * adminlte-filtered.scss
 * Copyright (c) 2024 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
@@ -23,7 +23,7 @@
 // copied from:

 /*!
- *   AdminLTE v4.0.0-alpha2
+ *   AdminLTE v4.0.0-rc3
 *   Author: Colorlib
 *   Website: AdminLTE.io <https://adminlte.io>
 *   License: Open source - MIT <https://opensource.org/licenses/MIT>
@@ -84,7 +84,6 @@
 // Bootstrap Utilities
@import "bootstrap/scss/utilities/api";

-
 // AdminLTE Configuration
 // ---------------------------------------------------
@import "admin-lte/src/scss/variables";
@@ -97,9 +96,12 @@
@import "admin-lte/src/scss/parts/components";
@import "admin-lte/src/scss/parts/extra-components";

-// @import "admin-lte/src/scss/parts/pages";
-@import "admin-lte/src/scss/pages/login_and_register";
+//
+// Part: Pages
+//

+@import "admin-lte/src/scss/pages/login_and_register";
@import "admin-lte/src/scss/parts/miscellaneous";

-
+// AdminLTE Accessibility Styles - WCAG 2.1 AA Compliance
+@import "admin-lte/src/scss/accessibility";
--- a/resources/assets/v2/src/sass/app.scss
+++ b/resources/assets/v2/src/sass/app.scss
@@ -26,6 +26,30 @@ $danger: #CD5029 !default;
 $primary: #1E6581 !default;
 $success: #64B624 !default;

+// admin LTE
+@use "admin-lte/src/scss/adminlte" with (
+    $color-mode-type: $color-mode-type,
+    $link-decoration: $link-decoration,
+    $font-family-sans-serif: $font-family-sans-serif,
+    $danger: $danger,
+    $primary: $primary,
+    $success: $success
+);
+
+@use '@fortawesome/fontawesome-free/scss/variables' with (
+  $font-path: "@fortawesome/fontawesome-free/webfonts"
+);
+
+@use '@fortawesome/fontawesome-free/scss/fontawesome';
+@use '@fortawesome/fontawesome-free/scss/fa' as fa;
+@use '@fortawesome/fontawesome-free/scss/solid.scss' as fa-solid;
+@use '@fortawesome/fontawesome-free/scss/brands.scss' as fa-brands;
+@use '@fortawesome/fontawesome-free/scss/regular.scss' as fa-regular;
+
+
+// some local CSS
+.skip-links {display: none;}
+
 /*
 Remove bottom margin from unstyled lists
 */
@@ -56,16 +80,7 @@ h3.hover-expand:hover {
    appearance: auto;
 }

-// Bootstrap
-// @import "bootstrap/scss/bootstrap";
-
-// admin LTE
-@import "adminlte-filtered";
-
-
-// @import "~bootstrap-sass/assets/stylesheets/bootstrap";
-
-// hover buttons
+// edit buttons
 .hidden-edit-button {
    cursor: pointer;
 }
@@ -73,12 +88,12 @@ td:not(:hover) .hidden-edit-button {
    visibility: hidden;
 }

+// Bootstrap
+// @import "bootstrap/scss/bootstrap";
+
+
+// @import "~bootstrap-sass/assets/stylesheets/bootstrap";
+
+// hover buttons


-// Font awesome
-//@import "~font-awesome/css/font-awesome";
-$fa-font-path: "@fortawesome/fontawesome-free/webfonts";
-@import "@fortawesome/fontawesome-free/scss/fontawesome.scss";
-@import "@fortawesome/fontawesome-free/scss/solid.scss";
-@import "@fortawesome/fontawesome-free/scss/brands.scss";
-@import "@fortawesome/fontawesome-free/scss/regular.scss";
--- a/resources/assets/v2/src/store/get-configuration.js
+++ b/resources/assets/v2/src/store/get-configuration.js
@@ -27,19 +27,29 @@ export function getConfiguration(name, defaultValue = null) {
    // to make things available quicker than if the store has to grab it through the API.
    // then again, it's not that slow.
    if (validCache && window.hasOwnProperty(name)) {
-        // console.log('Get from window');
+        console.log('Return configuration "' + name + '" from window: ' + window[name]);
        return Promise.resolve(window[name]);
    }
    // load from store2, if it's present.
    const fromStore = window.store.get(name);
    if (validCache && typeof fromStore !== 'undefined') {
+        console.log('Return configuration "' + name + '" from store: ' + fromStore);
        return Promise.resolve(fromStore);
    }
    let getter = (new Get);
    return getter.getByName(name).then((response) => {
        // console.log('Get "' + name + '" from API');
-        return Promise.resolve(parseResponse(name, response));
-    }).catch(() => {
+        console.log('Return configuration "' + name + '" from API: ' + parseConfigurationResponse(name, response));
+        return Promise.resolve(parseConfigurationResponse(name, response));
+    }).catch((error) => {
+        console.log('Returning "'+name+'" from DEFAULT: ' + defaultValue);
+        console.warn(error);
        return defaultValue;
    });
 }
+export function parseConfigurationResponse(name, response) {
+    let value = response.data.data.value;
+    window.store.set(name, value);
+    return value;
+}
+
--- a/resources/assets/v2/src/store/get-fresh-variable.js
+++ b/resources/assets/v2/src/store/get-fresh-variable.js
@@ -26,13 +26,17 @@ export function getFreshVariable(name, defaultValue = null) {
    return getter.getByName(name).then((response) => {
        // console.log('Get from API');
        return Promise.resolve(parseResponse(name, response));
-    }).catch(() => {
-        // preference does not exist (yet).
-        // POST it and then return it anyway.
-        let poster = (new Post);
-        poster.post(name, defaultValue).then((response) => {
-            return Promise.resolve(parseResponse(name, response));
-        });
+    }).catch((response) => {
+        if(response.status === 404) {
+            // preference does not exist (yet).
+            // POST it and then return it anyway.
+            let poster = (new Post);
+            poster.post(name, defaultValue).then((response) => {
+                return Promise.resolve(parseResponse(name, response));
+            });
+            return;
+        }
+        return Promise.resolve(null);
    });
 }

--- a/resources/assets/v2/src/store/get-variable.js
+++ b/resources/assets/v2/src/store/get-variable.js
@@ -27,16 +27,19 @@ export function getVariable(name, defaultValue = null) {
    // to make things available quicker than if the store has to grab it through the API.
    // then again, it's not that slow.
    if (validCache && window.hasOwnProperty(name)) {
+        console.log('Returning "'+name+'" from window: ' + window[name]);
        return Promise.resolve(window[name]);
    }
    // load from store2, if it's present.
    const fromStore = window.store.get(name);
    if (validCache && typeof fromStore !== 'undefined') {
+        console.log('Returning "'+name+'" from store: ' + fromStore);
        return Promise.resolve(fromStore);
    }
    let getter = (new Get);

    return getter.getByName(name).then((response) => {
+        console.log('Returning "'+name+'" from server: ' + parseResponse(name, response));
        return Promise.resolve(parseResponse(name, response));
    }).catch((error) => {
        if('' === defaultValue) {
@@ -47,6 +50,7 @@ export function getVariable(name, defaultValue = null) {
        // POST it and then return it anyway.
        let poster = (new Post);
        return poster.post(name, defaultValue).then((response) => {
+            console.log('Returning "'+name+'" from POST: ' + parseResponse(name, response));
            return Promise.resolve(parseResponse(name, response));
        });
    });
--- a/resources/assets/v2/src/store/set-variable.js
+++ b/resources/assets/v2/src/store/set-variable.js
@@ -28,19 +28,25 @@ export function setVariable(name, value = null) {
    // then again, it's not that slow.

    // set in window.x
-    // window[name] = value;
+    window[name] = value;

    // set in store:
    window.store.set(name, value);

    // post to user preferences (because why not):
    let putter = new Put();
-    putter.put(name, value).then((response) => {
-    }).catch(() => {
+    return putter.put(name, value).then((response) => {
+        console.log('set "'+name+'" to value: ', value);
+        return Promise.resolve(response);
+    }).catch((error) => {
+        console.error(error);
        // preference does not exist (yet).
        // POST it
        let poster = (new Post);
-        poster.post(name, value).then((response) => {
+            poster.post(name, value).then((response) => {
+                console.log('POST "'+name+'" to value: ', value);
+                return Promise.resolve(response);
        });
    });
+
 }
--- a/resources/assets/v2/src/support/default-chart-settings.js
+++ b/resources/assets/v2/src/support/default-chart-settings.js
@@ -62,6 +62,36 @@ function getDefaultChartSettings(type) {
            },
        };
    }
+    if('bar' === type) {
+        return {
+            type: 'bar',
+            data: {
+                labels: [],
+                datasets: [],
+            },
+            options: {
+                maintainAspectRatio: false,
+                indexAxis: 'y',
+                // Elements options apply to all the options unless overridden in a dataset
+                // In this case, we are setting the border of each horizontal bar to be 2px wide
+                elements: {
+                    bar: {
+                        borderWidth: 2,
+                    }
+                },
+                responsive: true,
+                plugins: {
+                    legend: {
+                        position: 'right',
+                    },
+                    title: {
+                        display: true,
+                        text: 'Chart.js Horizontal Bar Chart'
+                    }
+                }
+            },
+        };
+    }
    if ('line' === type) {
        return {
            options: {
--- a/resources/assets/v2/src/support/get-colors.js
+++ b/resources/assets/v2/src/support/get-colors.js
@@ -92,6 +92,14 @@ function getColors(type, field) {
                backgroundColor: background.rgbString(),
            };
            break;
+        case 'budgeted':
+            background = new Color(green.rgbString());
+            background.lighten(0.38);
+            colors = {
+                borderColor: green.rgbString(),
+                backgroundColor: background.rgbString(),
+            };
+            break;
        case 'overspent':
            background = new Color(red.rgbString());
            background.lighten(0.22);
--- a/resources/assets/v2/src/support/page-settings/show-internals-button.js
+++ b/resources/assets/v2/src/support/page-settings/show-internals-button.js
@@ -21,5 +21,9 @@

 export function showInternalsButton() {
    // console.log('showInternalsButton');
-    document.querySelector('.toggle-page-internals').classList.remove('d-none');
+    let obj = document.querySelector('.toggle-page-internals');
+    if (obj === null) {
+        return;
+    }
+    obj.classList.remove('d-none');
 }
--- a/resources/assets/v2/src/util/format-money.js
+++ b/resources/assets/v2/src/util/format-money.js
@@ -21,6 +21,14 @@
 import {format} from "date-fns";

 export default function (amount, currencyCode) {
+    if( (typeof amount !== 'number' && typeof amount !== 'string') || isNaN(amount)) {
+        console.warn('format-money: amount is not a number:', amount);
+        return '';
+    }
+    if(typeof currencyCode !== 'string' || currencyCode.length !== 3) {
+        console.warn('format-money: currencyCode is not a valid ISO 4217 code:', currencyCode);
+        return '';
+    }
    let locale = window.__localeId__.replace('_', '-');

    return Intl.NumberFormat(locale, {
--- a/resources/assets/v2/vite.config.js
+++ b/resources/assets/v2/vite.config.js
@@ -83,7 +83,8 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {

        server: {
            cors: true,
-            origin: 'https://192.168.96.154:5173',
+            // make sure this IP matches the IP of the dev machine.
+            origin: 'https://192.168.96.162:5173',
            watch: {
                usePolling: true,
            },
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -234,6 +234,7 @@ return [
    'advanced_options'                                                          => 'Advanced options',
    'advanced_options_explain'                                                  => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',
    'here_be_dragons'                                                           => 'Hic sunt dracones',
+    'bad_date_transaction' => 'Firefly III has detected you have transactions from before the year 1970. Please correct these transactions at your earliest convenience.',

    // Webhooks
    'webhooks'                                                                  => 'Webhooks',
@@ -1866,8 +1867,8 @@ return [
    'skip_help_text'                                                            => 'Use the skip field to create bi-monthly (skip = 1) or other custom intervals.',
    'subscription'                                                              => 'Subscription',
    'not_expected_period'                                                       => 'Not expected this period',
-    'subscriptions_in_group'                                                    => 'Subscriptions in group "%{title}"',
-    'subscr_expected_x_times'                                                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscriptions_in_group'                                                    => 'Subscriptions in group "{{title}}"',
+    'subscr_expected_x_times'                                                   => 'Expect to pay {{amount}} {{times}} times this period',
    'not_or_not_yet'                                                            => 'Not (yet)',
    'visit_bill'                                                                => 'Visit subscription ":name" at Firefly III',
    'match_between_amounts'                                                     => 'Subscription matches transactions between :low and :high.',
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -29,7 +29,7 @@
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
                <input type="hidden" name="invite_code" value="{{ $inviteCode ?? '' }}">
                <div class="input-group mb-3">
-                    <input type="email" name="email" autofocus required value="{{ $email }}" class="form-control" "
+                    <input type="email" name="email" autofocus required value="{{ $email }}" class="form-control"
                           placeholder="{{ trans('form.email') }}"/>
                    <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
                </div>
--- a/resources/views/v2/index.blade.php
+++ b/resources/views/v2/index.blade.php
@@ -7,7 +7,7 @@
            @include('partials.dashboard.boxes')

            <!-- row with account, budget and category data -->
-            <div class="row mb-2" x-data="accounts">
+            <div class="row mb-2" x-data="accounts" x-bind="eventListeners">
                <!-- column with 3 charts -->
                <div class="col-xl-8 col-lg-12 col-sm-12 col-xs-12">
                    <!-- row with account chart -->
@@ -37,11 +37,11 @@
                <div class="col">
                    <div class="card">
                        <div class="card-header">
-                            <h3 class="card-title"><a href="#" title="Something">recurring? rules? tags?</a></h3>
+                            <h3 class="card-title"><a href="#" title="Something">Income + sum</a></h3>
                        </div>
                        <div class="card-body">
                            <p>
-                                TODO
+                                List of income + sum
                            </p>
                        </div>
                    </div>
@@ -49,7 +49,7 @@
            </div>
        </div>

-        <div class="modal fade" id="internalsModal" tabindex="-1" aria-labelledby="internalsModalLabel"
+        <div x-data="index" class="modal fade" id="internalsModal" tabindex="-1" aria-labelledby="internalsModalLabel"
             aria-hidden="true">
            <div class="modal-dialog modal-lg">
                <div class="modal-content">
@@ -58,9 +58,17 @@
                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                    </div>
                    <div class="modal-body">
-                        <p>
-                            Buttons.
-                        </p>
+                        <div class="row mb-3">
+                            <label class="col-sm-4 col-form-label">Convert to native</label>
+                            <div class="col-sm-8">
+                                    <div class="form-check form-switch form-check-inline">
+                                        <label>
+                                            <input class="form-check-input" x-model="convertToNative" type="checkbox" @change="saveNativeSettings"> <span
+                                                >Yes no</span>
+                                        </label>
+                                    </div>
+                            </div>
+                        </div>
                    </div>
                    <div class="modal-footer">
                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>
--- a/resources/views/v2/partials/dashboard/account-chart.blade.php
+++ b/resources/views/v2/partials/dashboard/account-chart.blade.php
@@ -9,24 +9,6 @@
            <div class="card-body p-0" style="position: relative;height:400px;">
                <canvas id="account-chart"></canvas>
            </div>
-            <template x-if="convertToNativeAvailable">
-                <div class="card-footer text-end">
-                    <template x-if="convertToNative">
-                        <button type="button" @click="switchConvertToNative"
-                                class="btn btn-outline-info btm-sm">
-                                                    <span
-                                                        class="fa-solid fa-comments-dollar"></span> {{ __('firefly.disable_auto_convert')  }}
-                        </button>
-                    </template>
-                    <template x-if="!convertToNative">
-                        <button type="button" @click="switchConvertToNative"
-                                class="btn btn-outline-info btm-sm">
-                                                    <span
-                                                        class="fa-solid fa-comments-dollar"></span> {{ __('firefly.enable_auto_convert')  }}
-                        </button>
-                    </template>
-                </div>
-            </template>
        </div>

    </div>
--- a/resources/views/v2/partials/dashboard/account-list.blade.php
+++ b/resources/views/v2/partials/dashboard/account-list.blade.php
@@ -13,13 +13,13 @@
                           x-text="account.name"></a>

                        <span class="small">
-                            <template x-for="balance in account.balance">
-                                <span>x</span>
+                            <template x-for="balance in account.balances">
+                                <template x-if="balance.type === 'current'">
+                                    <span class="text-muted">(<span x-text="balance.amount_formatted"></span>)
+                                        </span>
+                                </template>
                            </template>
-                            <template x-for="balance in account.native_balance">
-                                <span>Y</span>
-                            </template>
-                                            </span>
+                        </span>
                    </h3>
                </div>
                <div class="card-body p-0">
--- a/resources/views/v2/partials/dashboard/boxes.blade.php
+++ b/resources/views/v2/partials/dashboard/boxes.blade.php
@@ -1,8 +1,8 @@
-<div class="row mb-2" x-data="boxes">
+<div class="row mb-2" x-data="boxes" x-bind="eventListeners">
    <div class="col-xl-3 col-lg-6 col-md-12 col-sm-12">
        <div class="small-box text-bg-primary">
            <div class="inner balance-box">
-                <h3 class="hover-expand">
+                <h4 class="hover-expand">
                    <template x-if="0 === balanceBox.amounts.length">
                        <span>&nbsp;</span>
                    </template>
@@ -12,7 +12,7 @@
                                :class="{ 'invisible': (balanceBox.amounts.length == index+1) }">, </span>
                        </span>
                    </template>
-                </h3>
+                </h4>
                <template x-if="loading">
                    <p class="d-none d-xs-block">
                        <em class="fa-solid fa-spinner fa-spin"></em>
@@ -53,17 +53,17 @@
        <div class="small-box text-bg-success">
            <div class="inner">
                <template x-if="0 === billBox.unpaid.length">
-                    <h3>&nbsp;</h3>
+                    <h4>&nbsp;</h4>
                </template>
                <template x-if="billBox.unpaid.length > 0">
-                <h3 class="hover-expand">
+                <h4 class="hover-expand">
                    <template x-for="(amount, index) in billBox.unpaid" :key="index">
                        <span>
                            <span x-text="amount"></span><span
                                :class="{ 'invisible': (billBox.unpaid.length == index+1) }">, </span>
                        </span>
                    </template>
-                </h3>
+                </h4>
                </template>
                <template x-if="loading">
                    <p class="d-none d-sm-block">
@@ -104,7 +104,7 @@
        <!--begin::Small Box Widget 3-->
        <div class="small-box text-bg-warning">
            <div class="inner">
-                <h3 class="hover-expand">
+                <h4 class="hover-expand">
                    <template x-if="0 === leftBox.left.length">
                        <span>&nbsp;</span>
                    </template>
@@ -114,7 +114,7 @@
                                :class="{ 'invisible': (leftBox.left.length == index+1) }">, </span>
                        </span>
                    </template>
-                </h3>
+                </h4>

                <template x-if="loading">
                    <p class="d-none d-sm-block">
@@ -153,14 +153,14 @@
        <!--begin::Small Box Widget 4-->
        <div class="small-box text-bg-danger">
            <div class="inner">
-                <h3 class="hover-expand">
+                <h4 class="hover-expand">
                    <template x-for="(amount, index) in netBox.net" :key="index">
                        <span>
                            <span x-text="amount"></span><span
                                :class="{ 'invisible': (netBox.net.length == index+1) }">, </span>
                        </span>
                    </template>
-                </h3>
+                </h4>

                <template x-if="loading">
                    <p class="d-none d-sm-block">
--- a/resources/views/v2/partials/dashboard/subscriptions.blade.php
+++ b/resources/views/v2/partials/dashboard/subscriptions.blade.php
@@ -10,6 +10,7 @@
            </div>
            <div class="card-body">
                <div class="row mb-2">
+                    <!--
                    <template x-for="pie in group.payment_info">
                        <div :class='group.col_size'>
                            <canvas :id='"pie_" + group.id + "_" + pie.currency_code'
@@ -17,6 +18,8 @@
                                    x-init="drawPieChart(group.id, group.title, pie)"></canvas>
                        </div>
                    </template>
+                    -->
+                    Here was chart.
                </div>
                <div class="row mb-2">
                    <table class="table table-striped table-hover">
Author	SHA1	Message	Date
github-actions[bot]	6bdff95d87	Merge pull request #10671 from firefly-iii/release-1753858574 🤖 Automatically merge the PR into the develop branch.	2025-07-30 08:56:22 +02:00
JC5	895ae279d5	🤖 Auto commit for release 'develop' on 2025-07-30	2025-07-30 08:56:14 +02:00
James Cole	8b57f45963	Return the promise.	2025-07-30 08:37:19 +02:00
James Cole	a2d2b7edd3	Add warning to translations.	2025-07-30 07:27:00 +02:00
James Cole	3d65f00c6e	Correct tag date and add warning.	2025-07-30 07:26:50 +02:00
James Cole	333004c4d9	Upgrade to font awesome 7, make sure chart includes currencies outside of limits.	2025-07-30 06:59:58 +02:00
James Cole	7451659824	Merge pull request #10661 from firefly-iii/dependabot/npm_and_yarn/develop/cross-env-10.0.0 Bump cross-env from 7.0.3 to 10.0.0	2025-07-28 20:44:31 +02:00
mergify[bot]	ec89c23ace	Merge branch 'develop' into dependabot/npm_and_yarn/develop/cross-env-10.0.0	2025-07-28 05:08:38 +00:00
James Cole	92d07d346f	Merge pull request #10660 from firefly-iii/dependabot/npm_and_yarn/develop/fortawesome/fontawesome-free-7.0.0 Bump @fortawesome/fontawesome-free from 6.7.2 to 7.0.0	2025-07-28 07:08:02 +02:00
mergify[bot]	a7ac894af2	Merge branch 'develop' into dependabot/npm_and_yarn/develop/cross-env-10.0.0	2025-07-28 04:39:49 +00:00
dependabot[bot]	20f89e3a7c	Bump cross-env from 7.0.3 to 10.0.0 Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.3 to 10.0.0. - [Release notes](https://github.com/kentcdodds/cross-env/releases) - [Changelog](https://github.com/kentcdodds/cross-env/blob/main/CHANGELOG.md) - [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.3...v10.0.0) --- updated-dependencies: - dependency-name: cross-env dependency-version: 10.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-28 04:39:15 +00:00
mergify[bot]	5d2f11c3c7	Merge branch 'develop' into dependabot/npm_and_yarn/develop/fortawesome/fontawesome-free-7.0.0	2025-07-28 04:38:58 +00:00
dependabot[bot]	1eea79e431	Bump @fortawesome/fontawesome-free from 6.7.2 to 7.0.0 Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 6.7.2 to 7.0.0. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/7.x/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.7.2...7.0.0) --- updated-dependencies: - dependency-name: "@fortawesome/fontawesome-free" dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-28 04:38:22 +00:00
James Cole	1aaaac67ca	Merge pull request #10659 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-2.1.20 Bump phpstan/phpstan from 2.1.19 to 2.1.20	2025-07-28 06:38:11 +02:00
mergify[bot]	1eb86639c9	Merge branch 'develop' into dependabot/composer/develop/phpstan/phpstan-2.1.20	2025-07-28 04:31:47 +00:00
dependabot[bot]	28b911c4ee	Bump phpstan/phpstan from 2.1.19 to 2.1.20 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 2.1.19 to 2.1.20. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/2.1.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/2.1.19...2.1.20) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-version: 2.1.20 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-28 04:31:06 +00:00
github-actions[bot]	c525c70ec0	Merge pull request #10657 from firefly-iii/release-1753673814 🤖 Automatically merge the PR into the develop branch.	2025-07-28 05:37:03 +02:00
JC5	1f7d6e218b	🤖 Auto commit for release 'develop' on 2025-07-28	2025-07-28 05:36:54 +02:00
James Cole	a69b6d9ce2	Respond to "convert to native".	2025-07-27 20:45:08 +02:00
James Cole	28b2ddde18	Account chart can do live update	2025-07-27 07:36:23 +02:00
James Cole	a16cc73c77	Sync "convert to native"	2025-07-26 19:17:26 +02:00
James Cole	46395e350a	Improved budget chart.	2025-07-26 06:47:21 +02:00
Sander Dorigo	f62e49090c	Merge branch 'main' into develop	2025-07-25 11:18:24 +02:00
James Cole	af3b40a314	Delete .github/workflows/sonarcloud.yml Signed-off-by: James Cole <james@firefly-iii.org>	2025-07-25 11:10:05 +02:00
James Cole	c3cea0fa9e	Update cleanup.yml Signed-off-by: James Cole <james@firefly-iii.org>	2025-07-25 11:09:55 +02:00
James Cole	6cbdb2ce70	Update index.js Fix thnigie Signed-off-by: James Cole <james@firefly-iii.org>	2025-07-25 10:56:42 +02:00
James Cole	b78460100d	Fix #10646	2025-07-25 05:44:03 +02:00
github-actions[bot]	bf6e1cb0e1	Merge pull request #10642 from firefly-iii/release-1753333227 🤖 Automatically merge the PR into the develop branch.	2025-07-24 07:00:35 +02:00
JC5	6a53f5031c	🤖 Auto commit for release 'develop' on 2025-07-24	2025-07-24 07:00:27 +02:00
James Cole	ae15ec01e8	Merge branch 'main' into develop	2025-07-24 06:56:07 +02:00
James Cole	fe3c7c47c4	Filter list of bills.	2025-07-24 06:55:53 +02:00
James Cole	68b934010c	Merge pull request #10640 from firefly-iii/dependabot/npm_and_yarn/npm_and_yarn-25988072ba Bump the npm_and_yarn group across 1 directory with 2 updates	2025-07-23 19:37:09 +02:00
dependabot[bot]	22852bd238	Bump the npm_and_yarn group across 1 directory with 2 updates Bumps the npm_and_yarn group with 1 update in the / directory: [axios](https://github.com/axios/axios). Updates `axios` from 1.10.0 to 1.11.0 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.10.0...v1.11.0) Updates `form-data` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](https://github.com/form-data/form-data/compare/v4.0.3...v4.0.4) --- updated-dependencies: - dependency-name: axios dependency-version: 1.11.0 dependency-type: direct:development dependency-group: npm_and_yarn - dependency-name: form-data dependency-version: 4.0.4 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-23 16:51:30 +00:00
github-actions[bot]	5b3b1804f3	Merge pull request #10638 from firefly-iii/release-1753247140 🤖 Automatically merge the PR into the develop branch.	2025-07-23 07:05:49 +02:00
JC5	f2588eb343	🤖 Auto commit for release 'develop' on 2025-07-23	2025-07-23 07:05:40 +02:00
James Cole	64a643ceec	Expand balances.	2025-07-23 07:01:10 +02:00
github-actions[bot]	1add505644	Merge pull request #10634 from firefly-iii/release-1753068994 🤖 Automatically merge the PR into the develop branch.	2025-07-21 05:36:42 +02:00
JC5	9663eb6a19	🤖 Auto commit for release 'develop' on 2025-07-21	2025-07-21 05:36:34 +02:00
github-actions[bot]	f30a24a02f	Merge pull request #10629 from firefly-iii/release-1753029916 🤖 Automatically merge the PR into the develop branch.	2025-07-20 18:45:22 +02:00
JC5	68655d60a6	🤖 Auto commit for release 'develop' on 2025-07-20	2025-07-20 18:45:16 +02:00
James Cole	63b0efcd81	Remove sonarcloud flow.	2025-07-20 18:41:05 +02:00
James Cole	93284682c8	Improve bill overview.	2025-07-20 14:02:53 +02:00
github-actions[bot]	3bafcb6ad2	Merge pull request #10625 from firefly-iii/release-1753007822 🤖 Automatically merge the PR into the develop branch.	2025-07-20 12:37:09 +02:00
JC5	942d027556	🤖 Auto commit for release 'develop' on 2025-07-20	2025-07-20 12:37:02 +02:00
James Cole	a60882d5f5	Clean up v2.	2025-07-20 12:32:53 +02:00
James Cole	680f554981	Fix #10618	2025-07-19 21:08:37 +02:00
James Cole	20e4dc07ce	Bad quote in html	2025-07-18 19:53:22 +02:00
James Cole	184d8eb027	Use new settings for php cs fixer.	2025-07-17 06:54:20 +02:00
github-actions[bot]	59725b088a	Merge pull request #10608 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-07-17 06:46:17 +02:00
github-actions[bot]	32fca4a9f5	Merge pull request #10607 from firefly-iii/release-1752727561 🤖 Automatically merge the PR into the develop branch.	2025-07-17 06:46:12 +02:00
JC5	7dccf6ec48	🤖 Auto commit for release 'v6.2.21' on 2025-07-17	2025-07-17 06:46:01 +02:00