Auto commit for release 'develop' on 2025-03-14

Merge pull request #9969 from firefly-iii/fix-9770
Fix #9770
2025-12-27 13:41:22 +00:00 · 2025-03-14 17:45:16 +01:00 · 2025-03-13 20:24:50 +01:00 · 2025-03-13 20:23:53 +01:00 · 2025-03-10 05:51:33 +01:00 · 2025-03-10 05:51:22 +01:00
328 changed files with 4977 additions and 3333 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -406,16 +406,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.68.5",
+            "version": "v3.72.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "7bedb718b633355272428c60736dc97fb96daf27"
+                "reference": "900389362c43d116fee1ffc51f7878145fa61b57"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7bedb718b633355272428c60736dc97fb96daf27",
-                "reference": "7bedb718b633355272428c60736dc97fb96daf27",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/900389362c43d116fee1ffc51f7878145fa61b57",
+                "reference": "900389362c43d116fee1ffc51f7878145fa61b57",
                "shasum": ""
            },
            "require": {
@@ -432,7 +432,7 @@
                "react/promise": "^2.0 || ^3.0",
                "react/socket": "^1.0",
                "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.1 || ^6.0",
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0 || ^7.0",
                "symfony/console": "^5.4 || ^6.4 || ^7.0",
                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
@@ -445,18 +445,18 @@
                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
            },
            "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.4",
-                "infection/infection": "^0.29.8",
-                "justinrainbow/json-schema": "^5.3 || ^6.0",
+                "facile-it/paraunit": "^1.3.1 || ^2.6",
+                "infection/infection": "^0.29.14",
+                "justinrainbow/json-schema": "^5.3 || ^6.2",
                "keradus/cli-executor": "^2.1",
                "mikey179/vfsstream": "^1.6.12",
                "php-coveralls/php-coveralls": "^2.7",
                "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
-                "phpunit/phpunit": "^9.6.22 || ^10.5.40 || ^11.5.2",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.15 || ^7.2.0",
-                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.2.0"
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
+                "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3",
+                "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3"
            },
            "suggest": {
                "ext-dom": "For handling output formats in XML",
@@ -497,7 +497,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.68.5"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.72.0"
            },
            "funding": [
                {
@@ -505,7 +505,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-01-30T17:00:50+00:00"
+            "time": "2025-03-13T11:25:37+00:00"
        },
        {
            "name": "psr/container",
@@ -1188,29 +1188,29 @@
        },
        {
            "name": "sebastian/diff",
-            "version": "6.0.2",
+            "version": "7.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
-                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.2"
+                "php": ">=8.3"
            },
            "require-dev": {
-                "phpunit/phpunit": "^11.0",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^12.0",
+                "symfony/process": "^7.2"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "7.0-dev"
                }
            },
            "autoload": {
@@ -1243,7 +1243,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
            },
            "funding": [
                {
@@ -1251,7 +1251,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-07-03T04:53:05+00:00"
+            "time": "2025-02-07T04:55:46+00:00"
        },
        {
            "name": "symfony/console",
@@ -2242,16 +2242,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.2.0",
+            "version": "v7.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
+                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
-                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
+                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
                "shasum": ""
            },
            "require": {
@@ -2283,7 +2283,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.0"
+                "source": "https://github.com/symfony/process/tree/v7.2.4"
            },
            "funding": [
                {
@@ -2299,7 +2299,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T14:24:19+00:00"
+            "time": "2025-02-05T08:33:46+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2386,16 +2386,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v7.2.2",
+            "version": "v7.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df"
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e46690d5b9d7164a6d061cab1e8d46141b9f49df",
-                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
                "shasum": ""
            },
            "require": {
@@ -2428,7 +2428,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.2.2"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.2.4"
            },
            "funding": [
                {
@@ -2444,7 +2444,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-12-18T14:28:33+00:00"
+            "time": "2025-02-24T10:49:57+00:00"
        },
        {
            "name": "symfony/string",
--- a/.env.example
+++ b/.env.example
@@ -19,7 +19,7 @@ SITE_OWNER=mail@example.com
 APP_KEY=SomeRandomStringOf32CharsExactly

 # Firefly III will launch using this language (for new users and unauthenticated visitors)
-# For a list of available languages: https://github.com/firefly-iii/firefly-iii/tree/main/resources/lang
+# For a list of available languages: https://github.com/firefly-iii/firefly-iii/blob/main/config/firefly.php#L123
 #
 # If text is still in English, remember that not everything may have been translated.
 DEFAULT_LANGUAGE=en_US
@@ -326,7 +326,7 @@ USE_RUNNING_BALANCE=false
 FIREFLY_III_LAYOUT=v1

 #
-# Which Query Parser implementation to use for the search rngine and rules
+# Which Query Parser implementation to use for the search engine and rules
 # 'new' is experimental, 'legacy' is the classic one
 #
 QUERY_PARSER_IMPLEMENTATION=legacy
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,5 +1,11 @@
---
 pull_request_rules:
+  - name: Make sure PR are up to date before merging
+    description: This automatically updates PRs when they are out-of-date with the
+      base branch to avoid semantic conflicts (next step is using a merge
+      queue).
+    conditions: []
+    actions:
+      update:
  - name: Close all on main
    conditions:
      - base=main
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -13,7 +13,7 @@ jobs:
  close_duplicates:
    runs-on: ubuntu-latest
    steps:
-      - uses: github/command@v1.3.0
+      - uses: github/command@v2.0.0
        id: command
        with:
          allowed_contexts: "issue"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -204,9 +204,9 @@ jobs:

          # zip and tar everything
          echo 'Zip and tar...'
-          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
+          zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*" "*Procfile*" "*crowdin.yml*" "*sonar-project.properties*"
          touch $tarName
-          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
+          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' --exclude='./Procfile' --exclude='../crowdin.yml' --exclude='./sonar-project.properties' -czf $tarName .

          # add sha256 sum
          echo 'Sha sum ...'
@@ -225,7 +225,7 @@ jobs:
            sudo chown -R runner:docker output.txt
            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
            echo "" >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d %H:%M')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
@@ -240,7 +240,7 @@ jobs:
            sudo chown -R runner:docker output.txt
            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
            echo "" >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d %H:%M')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
@@ -268,7 +268,7 @@ jobs:
            sudo chown -R runner:docker output.txt
            echo "Very early ALPHA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
            echo '' >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d %H:%M')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo '' >> output.txt
            echo '### Instructions' >> output.txt
            echo '' >> output.txt
@@ -286,7 +286,7 @@ jobs:
            sudo chown -R runner:docker output.txt
            echo "Very early BETA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
            echo '' >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d %H:%M')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo '' >> output.txt
            echo '### Instructions' >> output.txt
            echo '' >> output.txt
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,16 @@ public/build
 # ignore v1 build files
 resources/assets/v1/node_modules
 resources/assets/v1/build
+public/v1/js/app.js*
+public/v1/js/app_vue.js*
+public/v1/js/create*
+public/v1/js/edit*
+public/v1/js/profile*
+public/v1/js/administrations
+public/v1/js/exchange-rates
+public/v1/js/webhooks

 # ignore v2 build files
 resources/assets/v2/node_modules
 resources/assets/v2/build
+public/v2/i18n
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,8 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

 ## 2025
+- Lompi
+- Jose Diaz-Gonzalez
 - SoftBrix

 ## 2024
--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php
@@ -85,7 +85,7 @@ class AccountController extends Controller
        $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));

        // set date to subday + end-of-day for account balance. so it is at $date 23:59:59
-        $date->subDay()->endOfDay();
+        $date->endOfDay();

        /** @var Account $account */
        foreach ($result as $account) {
@@ -93,6 +93,7 @@ class AccountController extends Controller
            $currency        = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
            $useCurrency     = $currency;
            if (in_array($account->accountType->type, $this->balanceTypes, true)) {
+                // this one is correct.
                Log::debug(sprintf('accounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
                $balance         = Steam::finalAccountBalance($account, $date);
                $key             = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V1/Controllers/Models/Account/ListController.php
+++ b/app/Api/V1/Controllers/Models/Account/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -140,18 +141,18 @@ class ListController extends Controller
     */
    public function transactions(Request $request, Account $account): JsonResponse
    {
-        $pageSize    = $this->parameters->get('limit');
-        $type        = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
        $this->parameters->set('type', $type);
-        $types       = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager     = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager      = $this->getManager();

        /** @var User $admin */
-        $admin       = auth()->user();
+        $admin        = auth()->user();

        // use new group collector:
        /** @var GroupCollectorInterface $collector */
-        $collector   = app(GroupCollectorInterface::class);
+        $collector    = app(GroupCollectorInterface::class);
        $collector->setUser($admin)->setAccounts(new Collection([$account]))
            ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types)
        ;
@@ -163,15 +164,19 @@ class ListController extends Controller
            $collector->setEnd($this->parameters->get('end'));
        }

-        $paginator   = $collector->getPaginatedGroups();
+        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
-        $groups      = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
+        $transformer  = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource    = new FractalCollection($groups, $transformer, 'transactions');
+        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -29,7 +29,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -88,9 +90,16 @@ class ShowController extends Controller
        $count       = $collection->count();

        // continue sort:
-
        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts    = $enrichment->enrich($accounts);
+
        // make paginator:
        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
@@ -118,6 +127,15 @@ class ShowController extends Controller
        $account->refresh();
        $manager     = $this->getManager();

+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $account     = $enrichment->enrichSingle($account);
+
+
        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/Account/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Account/StoreController.php
@@ -27,7 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Models\Account;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Account\StoreRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;

@@ -69,6 +71,14 @@ class StoreController extends Controller
        $account     = $this->repository->store($data);
        $manager     = $this->getManager();

+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $account     = $enrichment->enrichSingle($account);
+
        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/Account/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php
@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Account\UpdateRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;

@@ -73,6 +75,14 @@ class UpdateController extends Controller
        $account->refresh();
        app('preferences')->mark();

+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $account      = $enrichment->enrichSingle($account);
+
        /** @var AccountTransformer $transformer */
        $transformer  = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/Bill/ListController.php
+++ b/app/Api/V1/Controllers/Models/Bill/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -176,7 +177,11 @@ class ListController extends Controller
        // get paginator.
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/Budget/ListController.php
+++ b/app/Api/V1/Controllers/Models/Budget/ListController.php
@@ -32,6 +32,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -172,7 +173,11 @@ class ListController extends Controller

        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
@@ -232,7 +237,11 @@ class ListController extends Controller

        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -84,7 +85,11 @@ class ListController extends Controller
        $collector->setTypes($types);
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/Category/ListController.php
+++ b/app/Api/V1/Controllers/Models/Category/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -139,7 +140,11 @@ class ListController extends Controller

        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php
@@ -30,7 +30,7 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php
@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;

 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Models\CurrencyExchangeRate;
-use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
+++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php
@@ -28,9 +28,11 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -75,17 +77,25 @@ class ListController extends Controller

        $collection  = $piggyBank->accounts;
        $count       = $collection->count();
-        $events      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts    = $enrichment->enrich($accounts);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
+        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.piggy-banks.accounts', [$piggyBank->id]).$this->buildParams());

        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource    = new FractalCollection($events, $transformer, 'accounts');
+        $resource    = new FractalCollection($accounts, $transformer, 'accounts');
        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
--- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -110,7 +111,11 @@ class ListController extends Controller

        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php
@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Models\Rule\TestRequest;
 use FireflyIII\Api\V1\Requests\Models\Rule\TriggerRequest;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -94,6 +95,11 @@ class TriggerController extends Controller
        $transactions = $ruleEngine->find();
        $count        = $transactions->count();

+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($rule->user);
+        $transactions = $enrichment->enrich($transactions);
+
        $paginator    = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.rules.test', [$rule->id]).$this->buildParams());

--- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php
@@ -30,6 +30,7 @@ use FireflyIII\Api\V1\Requests\Models\RuleGroup\TriggerRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -100,6 +101,11 @@ class TriggerController extends Controller
        $transactions = $ruleEngine->find();
        $count        = $transactions->count();

+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($group->user);
+        $transactions = $enrichment->enrich($transactions);
+
        $paginator    = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.rule-groups.test', [$group->id]).$this->buildParams());

--- a/app/Api/V1/Controllers/Models/Tag/ListController.php
+++ b/app/Api/V1/Controllers/Models/Tag/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -141,7 +142,12 @@ class ListController extends Controller
        }
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.tags.transactions', [$tag->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
+

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -85,7 +86,11 @@ class ShowController extends Controller
        }
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
@@ -137,6 +142,11 @@ class ShowController extends Controller
            throw new NotFoundHttpException();
        }

+        // enrich
+        $enrichment    = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $selectedGroup = $enrichment->enrichSingle($selectedGroup);
+
        /** @var TransactionGroupTransformer $transformer */
        $transformer   = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php
@@ -34,6 +34,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Rules\IsDuplicateTransaction;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -89,6 +90,7 @@ class StoreController extends Controller
        $data['user']       = auth()->user();
        $data['user_group'] = $this->userGroup;

+
        Log::channel('audit')->info('Store new transaction over API.', $data);

        try {
@@ -133,6 +135,11 @@ class StoreController extends Controller
            throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
        }

+        // enrich
+        $enrichment         = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $selectedGroup      = $enrichment->enrichSingle($selectedGroup);
+
        /** @var TransactionGroupTransformer $transformer */
        $transformer        = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php
@@ -30,6 +30,7 @@ use FireflyIII\Events\UpdatedTransactionGroup;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -99,6 +100,11 @@ class UpdateController extends Controller
            throw new NotFoundHttpException();
        }

+        // enrich
+        $enrichment       = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $selectedGroup    = $enrichment->enrichSingle($selectedGroup);
+
        /** @var TransactionGroupTransformer $transformer */
        $transformer      = app(TransactionGroupTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php
@@ -42,6 +42,8 @@ use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\Transformers\BillTransformer;
@@ -100,6 +102,14 @@ class ListController extends Controller
        $count             = $collection->count();
        $accounts          = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

+        // enrich
+        /** @var User $admin */
+        $admin             = auth()->user();
+        $enrichment        = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts          = $enrichment->enrich($accounts);
+
        // make paginator:
        $paginator         = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]).$this->buildParams());
@@ -360,7 +370,11 @@ class ListController extends Controller
        }
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php
@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CurrencyTransformer;
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -109,7 +110,11 @@ class ListController extends Controller
        }
        $paginator    = $collector->getPaginatedGroups();
        $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@@ -26,8 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Search;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Support\Search\AccountSearch;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -81,6 +83,14 @@ class AccountController extends Controller

        $accounts    = $search->search();

+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts    = $enrichment->enrich($accounts);
+
        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/Search/TransactionController.php
+++ b/app/Api/V1/Controllers/Search/TransactionController.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Search;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Support\Search\SearchInterface;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use Illuminate\Http\JsonResponse;
@@ -57,7 +58,11 @@ class TransactionController extends Controller
        $parameters   = ['search' => $fullQuery];
        $url          = route('api.v1.search.transactions').'?'.http_build_query($parameters);
        $groups->setPath($url);
-        $transactions = $groups->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser(auth()->user());
+        $transactions = $enrichment->enrich($groups->getCollection());

        /** @var TransactionGroupTransformer $transformer */
        $transformer  = app(TransactionGroupTransformer::class);
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -37,7 +37,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -102,7 +102,7 @@ class BasicController extends Controller
        $balanceData  = $this->getBalanceInformation($start, $end);
        $billData     = $this->getBillInformation($start, $end);
        $spentData    = $this->getLeftToSpendInfo($start, $end);
-        $netWorthData = $this->getNetWorthInfo($start, $end);
+        $netWorthData = $this->getNetWorthInfo($end);
        //                $balanceData  = [];
        //                $billData     = [];
        //                $spentData    = [];
@@ -185,8 +185,8 @@ class BasicController extends Controller
                'currency_decimal_places' => $currency->decimal_places,
                'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId] ?? '0', false),
                'local_icon'              => 'balance-scale',
-                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false).
-                                             ' + '.app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false)
+                                             .' + '.app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
            ];
            $return[] = [
                'key'                     => sprintf('spent-in-%s', $currency->code),
@@ -213,6 +213,47 @@ class BasicController extends Controller
                'sub_title'               => '',
            ];
        }
+        if (0 === count($return)) {
+            $currency = $this->nativeCurrency;
+            // create objects for big array.
+            $return[] = [
+                'key'                     => sprintf('balance-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => app('amount')->formatAnything($currency, '0', false)
+                    .' + '.app('amount')->formatAnything($currency, '0', false),
+            ];
+            $return[] = [
+                'key'                     => sprintf('spent-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+            $return[] = [
+                'key'                     => sprintf('earned-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+        }

        return $return;
    }
@@ -268,6 +309,37 @@ class BasicController extends Controller
        }
        app('log')->debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));

+        if (0 === count($return)) {
+            $currency = $this->nativeCurrency;
+            unset($info, $amount);
+
+            $return[] = [
+                'key'                     => sprintf('bills-paid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+                'local_icon'              => 'check',
+                'sub_title'               => '',
+            ];
+            $return[] = [
+                'key'                     => sprintf('bills-unpaid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+                'local_icon'              => 'calendar-o',
+                'sub_title'               => '',
+            ];
+        }
+
+
        return $return;
    }

@@ -315,22 +387,37 @@ class BasicController extends Controller
                ),
            ];
        }
+        if (0 === count($return)) {
+            $currency = $this->nativeCurrency;
+            $return[] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+                'local_icon'              => 'money',
+                'sub_title'               => app('amount')->formatFlat(
+                    $currency->symbol,
+                    $currency->decimal_places,
+                    '0',
+                    false
+                ),
+            ];
+        }

        return $return;
    }

-    private function getNetWorthInfo(Carbon $start, Carbon $end): array
+    private function getNetWorthInfo(Carbon $end): array
    {
-        Log::debug('getNetWorthInfo');
+        $end->endOfDay();

        /** @var User $user */
        $user           = auth()->user();
-        $date           = now(config('app.timezone'));
-        // start and end in the future? use $end
-        if ($this->notInDateRange($date, $start, $end)) {
-            /** @var Carbon $date */
-            $date = session('end', today(config('app.timezone'))->endOfMonth());
-        }
+        Log::debug(sprintf('getNetWorthInfo up until "%s".', $end->format('Y-m-d H:i:s')));

        /** @var NetWorthInterface $netWorthHelper */
        $netWorthHelper = app(NetWorthInterface::class);
@@ -346,7 +433,7 @@ class BasicController extends Controller
            }
        );

-        $netWorthSet    = $netWorthHelper->byAccounts($filtered, $date);
+        $netWorthSet    = $netWorthHelper->byAccounts($filtered, $end);
        $return         = [];
        foreach ($netWorthSet as $key => $data) {
            if ('native' === $key) {
@@ -370,6 +457,22 @@ class BasicController extends Controller
                'sub_title'               => '',
            ];
        }
+        if (0 === count($return)) {
+            $return[] = [
+                'key'                     => sprintf('net-worth-in-%s', $this->nativeCurrency->code),
+                'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $this->nativeCurrency->symbol]),
+                'monetary_value'          => '0',
+                'currency_id'             => (string) $this->nativeCurrency->id,
+                'currency_code'           => $this->nativeCurrency->code,
+                'currency_symbol'         => $this->nativeCurrency->symbol,
+                'currency_decimal_places' => $this->nativeCurrency->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($this->nativeCurrency->symbol, $this->nativeCurrency->decimal_places, '0', false),
+                'local_icon'              => 'line-chart',
+                'sub_title'               => '',
+            ];
+        }
+
+
        Log::debug('End of getNetWorthInfo');

        return $return;
--- a/app/Api/V1/Controllers/System/AboutController.php
+++ b/app/Api/V1/Controllers/System/AboutController.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\System;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Transformers\UserTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
 use League\Fractal\Resource\Item;

 /**
@@ -48,7 +49,7 @@ class AboutController extends Controller
        $replace       = ['\~', '# '];
        $phpVersion    = str_replace($search, $replace, PHP_VERSION);
        $phpOs         = str_replace($search, $replace, PHP_OS);
-        $currentDriver = \DB::getDriverName();
+        $currentDriver = DB::getDriverName();
        $data
                       = [
                           'version'     => config('firefly.version'),
--- a/app/Api/V1/Requests/Data/DestroyRequest.php
+++ b/app/Api/V1/Requests/Data/DestroyRequest.php
@@ -49,9 +49,9 @@ class DestroyRequest extends FormRequest
     */
    public function rules(): array
    {
-        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'.
-                 ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'.
-                 ',not_assets_liabilities';
+        $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'
+                 .',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'
+                 .',not_assets_liabilities';

        return [
            'objects' => sprintf('required|max:255|min:1|string|in:%s', $valid),
--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
@@ -65,25 +65,6 @@ class StoreRequest extends FormRequest
        return $data;
    }

-    private function parseAccounts(mixed $array): array
-    {
-        if (!is_array($array)) {
-            return [];
-        }
-        $return = [];
-        foreach ($array as $entry) {
-            if (!is_array($entry)) {
-                continue;
-            }
-            $return[] = [
-                'account_id'     => $this->integerFromValue((string) ($entry['account_id'] ?? '0')),
-                'current_amount' => $this->clearString((string) ($entry['current_amount'] ?? '0')),
-            ];
-        }
-
-        return $return;
-    }
-
    /**
     * The rules that the incoming request must be matched against.
     */
--- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php
@@ -25,8 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;

 use FireflyIII\Models\PiggyBank;
-use FireflyIII\Rules\IsAssetAccountId;
 use FireflyIII\Rules\IsValidPositiveAmount;
+use FireflyIII\Rules\IsValidZeroOrMoreAmount;
 use FireflyIII\Rules\LessThanPiggyTarget;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -45,20 +45,23 @@ class UpdateRequest extends FormRequest
     */
    public function getAll(): array
    {
-        $fields = [
-            'name'               => ['name', 'convertString'],
-            'account_id'         => ['account_id', 'convertInteger'],
-            'targetamount'       => ['target_amount', 'convertString'],
-            'current_amount'     => ['current_amount', 'convertString'],
-            'startdate'          => ['start_date', 'convertDateTime'],
-            'targetdate'         => ['target_date', 'convertDateTime'],
-            'notes'              => ['notes', 'stringWithNewlines'],
-            'order'              => ['order', 'convertInteger'],
-            'object_group_title' => ['object_group_title', 'convertString'],
-            'object_group_id'    => ['object_group_id', 'convertInteger'],
+        $fields             = [
+            'name'                      => ['name', 'convertString'],
+            'target_amount'             => ['target_amount', 'convertString'],
+            'start_date'                => ['start_date', 'convertDateTime'],
+            'target_date'               => ['target_date', 'convertDateTime'],
+            'notes'                     => ['notes', 'stringWithNewlines'],
+            'order'                     => ['order', 'convertInteger'],
+            'object_group_title'        => ['object_group_title', 'convertString'],
+            'object_group_id'           => ['object_group_id', 'convertInteger'],
+            'transaction_currency_code' => ['transaction_currency_code', 'convertString'],
+            'transaction_currency_id'   => ['transaction_currency_id', 'convertInteger'],
        ];

-        return $this->getAllData($fields);
+        $result             = $this->getAllData($fields);
+        $result['accounts'] = $this->parseAccounts($this->get('accounts'));
+
+        return $result;
    }

    /**
@@ -70,13 +73,20 @@ class UpdateRequest extends FormRequest
        $piggyBank = $this->route()->parameter('piggyBank');

        return [
-            'name'           => 'min:1|max:255|uniquePiggyBankForUser:'.$piggyBank->id,
-            'current_amount' => ['nullable', new LessThanPiggyTarget(), new IsValidPositiveAmount()],
-            'target_amount'  => ['nullable', new IsValidPositiveAmount()],
-            'start_date'     => 'date|nullable',
-            'target_date'    => 'date|nullable|after:start_date',
-            'notes'          => 'max:65000',
-            'account_id'     => ['belongsToUser:accounts', new IsAssetAccountId()],
+            'name'                      => 'min:1|max:255|uniquePiggyBankForUser:'.$piggyBank->id,
+            'current_amount'            => ['nullable', new LessThanPiggyTarget(), new IsValidPositiveAmount()],
+            'target_amount'             => ['nullable', new IsValidZeroOrMoreAmount()],
+            'start_date'                => 'date|nullable',
+            'target_date'               => 'date|nullable|after:start_date',
+            'notes'                     => 'max:65000',
+            'accounts'                  => 'required',
+            'accounts.*'                => 'array|required',
+            'accounts.*.account_id'     => ['required', 'numeric', 'belongsToUser:accounts,id'],
+            'accounts.*.current_amount' => ['numeric', 'nullable', new IsValidZeroOrMoreAmount(true)],
+            'object_group_id'           => 'numeric|belongsToUser:object_groups,id',
+            'object_group_title'        => ['min:1', 'max:255'],
+            'transaction_currency_id'   => 'exists:transaction_currencies,id|nullable',
+            'transaction_currency_code' => 'exists:transaction_currencies,code|nullable',
        ];
    }
 }
--- a/app/Api/V1/Requests/Models/Rule/TestRequest.php
+++ b/app/Api/V1/Requests/Models/Rule/TestRequest.php
@@ -65,7 +65,7 @@ class TestRequest extends FormRequest

    private function getAccounts(): array
    {
-        return $this->get('accounts');
+        return $this->get('accounts') ?? [];
    }

    public function rules(): array
--- a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
+++ b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
@@ -59,7 +59,7 @@ class TestRequest extends FormRequest

    private function getAccounts(): array
    {
-        return $this->get('accounts');
+        return $this->get('accounts') ?? [];
    }

    public function rules(): array
--- a/app/Api/V2/Controllers/Autocomplete/AccountController.php
+++ b/app/Api/V2/Controllers/Autocomplete/AccountController.php
@@ -30,7 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountBalance;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
@@ -69,7 +69,7 @@ class AccountController extends Controller
    public function accounts(AutocompleteRequest $request): JsonResponse
    {
        $params = $request->getParameters();
-        $result = $this->repository->searchAccount($params['query'], $params['account_types'], $params['page'], $params['size']);
+        $result = $this->repository->searchAccount($params['query'], $params['account_types'], $params['size']);
        $return = [];

        /** @var Account $account */
--- a/app/Api/V2/Controllers/Autocomplete/CategoryController.php
+++ b/app/Api/V2/Controllers/Autocomplete/CategoryController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Autocomplete;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Category;
-use FireflyIII\Repositories\UserGroups\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use Illuminate\Http\JsonResponse;

 /**
--- a/app/Api/V2/Controllers/Autocomplete/TagController.php
+++ b/app/Api/V2/Controllers/Autocomplete/TagController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Autocomplete;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Tag;
-use FireflyIII\Repositories\UserGroups\Tag\TagRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Http\JsonResponse;

 /**
@@ -59,7 +59,7 @@ class TagController extends Controller
    public function tags(AutocompleteRequest $request): JsonResponse
    {
        $queryParameters = $request->getParameters();
-        $result          = $this->repository->searchTag($queryParameters['query'], $queryParameters['size']);
+        $result          = $this->repository->searchTag($queryParameters['query']);
        $filtered        = $result->map(
            static function (Tag $item) {
                return [
--- a/app/Api/V2/Controllers/Autocomplete/TransactionController.php
+++ b/app/Api/V2/Controllers/Autocomplete/TransactionController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Autocomplete;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\UserGroups\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Http\JsonResponse;

 /**
--- a/app/Api/V2/Controllers/Chart/AccountController.php
+++ b/app/Api/V2/Controllers/Chart/AccountController.php
@@ -29,7 +29,7 @@ use FireflyIII\Api\V2\Request\Chart\ChartRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Chart\ChartData;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\CleansChartData;
--- a/app/Api/V2/Controllers/Chart/BalanceController.php
+++ b/app/Api/V2/Controllers/Chart/BalanceController.php
@@ -30,7 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Chart\ChartData;
 use FireflyIII\Support\Http\Api\AccountBalanceGrouped;
 use FireflyIII\Support\Http\Api\CleansChartData;
--- a/app/Api/V2/Controllers/Chart/BudgetController.php
+++ b/app/Api/V2/Controllers/Chart/BudgetController.php
@@ -32,8 +32,8 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
--- a/app/Api/V2/Controllers/Chart/CategoryController.php
+++ b/app/Api/V2/Controllers/Chart/CategoryController.php
@@ -31,8 +31,8 @@ use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
--- a/app/Api/V2/Controllers/Model/Account/IndexController.php
+++ b/app/Api/V2/Controllers/Model/Account/IndexController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Account;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\Account\IndexRequest;
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\V2\AccountTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -67,7 +67,7 @@ class IndexController extends Controller
        $types             = $request->getAccountTypes();
        $sorting           = $request->getSortInstructions('accounts');
        $filters           = $request->getFilterInstructions('accounts');
-        $accounts          = $this->repository->getAccountsByType($types, $sorting, $filters);
+        $accounts          = $this->repository->getAccountsByType($types, $sorting);
        $pageSize          = $this->parameters->get('limit');
        $count             = $accounts->count();

--- a/app/Api/V2/Controllers/Model/Account/ShowController.php
+++ b/app/Api/V2/Controllers/Model/Account/ShowController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Account;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\V2\AccountTransformer;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V2/Controllers/Model/Account/UpdateController.php
+++ b/app/Api/V2/Controllers/Model/Account/UpdateController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Account;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\Account\UpdateRequest;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\V2\AccountTransformer;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V2/Controllers/Model/Bill/IndexController.php
+++ b/app/Api/V2/Controllers/Model/Bill/IndexController.php
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Model\Bill;

 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\BillTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V2/Controllers/Model/Bill/ShowController.php
+++ b/app/Api/V2/Controllers/Model/Bill/ShowController.php
@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Bill;

 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Models\Bill;
-use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\BillTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V2/Controllers/Model/Bill/SumController.php
+++ b/app/Api/V2/Controllers/Model/Bill/SumController.php
@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\Bill;

 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
-use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V2/Controllers/Model/Currency/IndexController.php
+++ b/app/Api/V2/Controllers/Model/Currency/IndexController.php
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Model\Currency;

 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\V2\CurrencyTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
--- a/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php
+++ b/app/Api/V2/Controllers/Model/PiggyBank/IndexController.php
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Controllers\Model\PiggyBank;

 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\PiggyBankTransformer;
 use Illuminate\Http\JsonResponse;
--- a/app/Api/V2/Controllers/Model/Transaction/StoreController.php
+++ b/app/Api/V2/Controllers/Model/Transaction/StoreController.php
@@ -73,6 +73,7 @@ class StoreController extends Controller
        $userGroup          = $request->getUserGroup();
        $data['user_group'] = $userGroup;

+
        // overrule user group and see where we end up.
        // what happens when we refer to a budget that is not in this user group?

--- a/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php
+++ b/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\TransactionCurrency;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\TransactionCurrency\IndexRequest;
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\V2\CurrencyTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
--- a/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php
+++ b/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php
@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\TransactionCurrency;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\V2\CurrencyTransformer;
 use Illuminate\Http\JsonResponse;

--- a/app/Api/V2/Controllers/Summary/BasicController.php
+++ b/app/Api/V2/Controllers/Summary/BasicController.php
@@ -34,12 +34,12 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Budget\AvailableBudgetRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\SummaryBalanceGrouped;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
--- a/app/Api/V2/Controllers/Summary/NetWorthController.php
+++ b/app/Api/V2/Controllers/Summary/NetWorthController.php
@@ -29,7 +29,7 @@ use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;

--- a/app/Console/Commands/Correction/CorrectsCurrencies.php
+++ b/app/Console/Commands/Correction/CorrectsCurrencies.php
@@ -31,7 +31,7 @@ use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
--- a/app/Console/Commands/Correction/CorrectsGroupAccounts.php
+++ b/app/Console/Commands/Correction/CorrectsGroupAccounts.php
@@ -30,6 +30,7 @@ use FireflyIII\Handlers\Events\UpdatedGroupEventHandler;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 class CorrectsGroupAccounts extends Command
 {
@@ -45,7 +46,7 @@ class CorrectsGroupAccounts extends Command
    {
        $groups  = [];
        $res     = TransactionJournal::groupBy('transaction_group_id')
-            ->get(['transaction_group_id', \DB::raw('COUNT(transaction_group_id) as the_count')])// @phpstan-ignore-line
+            ->get(['transaction_group_id', DB::raw('COUNT(transaction_group_id) as the_count')])// @phpstan-ignore-line
        ;

        /** @var TransactionJournal $journal */
--- a/app/Console/Commands/Correction/CorrectsGroupInformation.php
+++ b/app/Console/Commands/Correction/CorrectsGroupInformation.php
@@ -33,6 +33,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\ObjectGroup;
+use FireflyIII\Models\Preference;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
@@ -89,6 +90,7 @@ class CorrectsGroupInformation extends Command
            Category::class,
            ObjectGroup::class,
            CurrencyExchangeRate::class,
+            Preference::class,
            Recurrence::class,
            RuleGroup::class,
            Rule::class,
--- a/app/Console/Commands/Correction/CorrectsNativeAmounts.php
+++ b/app/Console/Commands/Correction/CorrectsNativeAmounts.php
@@ -39,7 +39,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Console\Command;
--- a/app/Console/Commands/Correction/CorrectsUnevenAmount.php
+++ b/app/Console/Commands/Correction/CorrectsUnevenAmount.php
@@ -30,6 +30,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

 class CorrectsUnevenAmount extends Command
@@ -118,10 +119,10 @@ class CorrectsUnevenAmount extends Command

    private function fixUnevenAmounts(): void
    {
-        $journals = \DB::table('transactions')
+        $journals = DB::table('transactions')
            ->groupBy('transaction_journal_id')
            ->whereNull('deleted_at')
-            ->get(['transaction_journal_id', \DB::raw('SUM(amount) AS the_sum')])  // @phpstan-ignore-line
+            ->get(['transaction_journal_id', DB::raw('SUM(amount) AS the_sum')])
        ;

        /** @var \stdClass $entry */
@@ -262,7 +263,7 @@ class CorrectsUnevenAmount extends Command
    private function matchCurrencies(): void
    {
        $journals = TransactionJournal::leftJoin('transactions', 'transaction_journals.id', 'transactions.transaction_journal_id')
-            ->where('transactions.transaction_currency_id', '!=', \DB::raw('transaction_journals.transaction_currency_id'))
+            ->where('transactions.transaction_currency_id', '!=', DB::raw('transaction_journals.transaction_currency_id'))
            ->get(['transaction_journals.*'])
        ;

--- a/app/Console/Commands/Correction/RemovesEmptyJournals.php
+++ b/app/Console/Commands/Correction/RemovesEmptyJournals.php
@@ -29,6 +29,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\DB;

 class RemovesEmptyJournals extends Command
 {
@@ -56,7 +57,7 @@ class RemovesEmptyJournals extends Command
    {
        $set   = Transaction::whereNull('deleted_at')
            ->groupBy('transactions.transaction_journal_id')
-            ->get([\DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']) // @phpstan-ignore-line
+            ->get([DB::raw('COUNT(transactions.transaction_journal_id) as the_count'), 'transaction_journal_id']) // @phpstan-ignore-line
        ;
        $total = 0;

--- a/app/Console/Commands/Export/ExportsData.php
+++ b/app/Console/Commands/Export/ExportsData.php
@@ -106,7 +106,7 @@ class ExportsData extends Command
        $exporter->setExportTags($options['export']['tags']);
        $exporter->setExportRecurring($options['export']['recurring']);
        $exporter->setExportRules($options['export']['rules']);
-        $exporter->setExportBills($options['export']['subscriptions']);
+        $exporter->setExportBills($options['export']['bills']);
        $exporter->setExportPiggies($options['export']['piggies']);
        $data       = $exporter->export();
        if (0 === count($data)) {
--- a/app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php
+++ b/app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ValidatesEnvironmentVariables.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+namespace FireflyIII\Console\Commands\Integrity;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+
+class ValidatesEnvironmentVariables extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'integrity:validates-environment-variables';
+
+    /**
+     * The console command description.
+     *
+     * @var null|string
+     */
+    protected $description = 'Makes sure you use the correct variables.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $this->validateLanguage();
+        $this->validateGuard();
+        $this->validateStaticToken();
+
+        return Command::SUCCESS;
+    }
+
+    private function validateLanguage(): void
+    {
+        $language  = config('firefly.default_language');
+        $locale    = config('firefly.default_locale');
+        $options   = array_keys(config('firefly.languages'));
+
+        if (!in_array($language, $options, true)) {
+            $this->friendlyError(sprintf('DEFAULT_LANGUAGE "%s" is not a valid language for Firefly III.', $language));
+            $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
+            $this->friendlyError(sprintf('Valid languages are: %s', implode(', ', $options)));
+
+            exit(1);
+        }
+        $options[] = 'equal';
+        if (!in_array($locale, $options, true)) {
+            $this->friendlyError(sprintf('DEFAULT_LOCALE "%s" is not a valid local for Firefly III.', $locale));
+            $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
+            $this->friendlyError(sprintf('Valid locales are: %s', implode(', ', $options)));
+
+            exit(1);
+        }
+    }
+
+    private function validateGuard(): void
+    {
+        $guard = config('auth.defaults.guard');
+        if ('web' !== $guard && 'remote_user_guard' !== $guard) {
+            $this->friendlyError(sprintf('AUTHENTICATION_GUARD "%s" is not a valid guard for Firefly III.', $guard));
+            $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
+            $this->friendlyError('Valid guards are: web, remote_user_guard');
+
+            exit(1);
+        }
+    }
+
+    private function validateStaticToken(): void
+    {
+        $token = (string) config('firefly.static_cron_token');
+        if ('' !== $token && 32 !== strlen($token)) {
+            $this->friendlyError('STATIC_CRON_TOKEN must be empty or a 32-character string.');
+            $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
+
+            exit(1);
+        }
+    }
+}
--- a/app/Console/Commands/System/CreatesFirstUser.php
+++ b/app/Console/Commands/System/CreatesFirstUser.php
@@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;

 class CreatesFirstUser extends Command
 {
@@ -61,11 +62,11 @@ class CreatesFirstUser extends Command
            'email'        => $this->argument('email'),
            'role'         => 'owner',
        ];
-        $password       = \Str::random(24);
+        $password       = Str::random(24);
        $user           = $this->repository->store($data);
        $user->password = Hash::make($password);
        $user->save();
-        $user->setRememberToken(\Str::random(60));
+        $user->setRememberToken(Str::random(60));

        $this->friendlyInfo(sprintf('Created new admin user (ID #%d) with email address "%s" and password "%s".', $user->id, $user->email, $password));
        $this->friendlyWarning('Change this password.');
--- a/app/Console/Commands/System/ScansAttachments.php
+++ b/app/Console/Commands/System/ScansAttachments.php
@@ -28,6 +28,8 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Storage;

 class ScansAttachments extends Command
 {
@@ -43,7 +45,7 @@ class ScansAttachments extends Command
    public function handle(): int
    {
        $attachments = Attachment::get();
-        $disk        = \Storage::disk('upload');
+        $disk        = Storage::disk('upload');

        /** @var Attachment $attachment */
        foreach ($attachments as $attachment) {
@@ -56,7 +58,7 @@ class ScansAttachments extends Command
            }

            try {
-                $decryptedContent = \Crypt::decrypt($encryptedContent); // verified
+                $decryptedContent = Crypt::decrypt($encryptedContent); // verified
            } catch (DecryptException $e) {
                app('log')->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
                $decryptedContent = $encryptedContent;
--- a/app/Console/Commands/System/VerifySecurityAlerts.php
+++ b/app/Console/Commands/System/VerifySecurityAlerts.php
@@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\System;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Storage;
 use League\Flysystem\FilesystemException;

 class VerifySecurityAlerts extends Command
@@ -48,7 +49,7 @@ class VerifySecurityAlerts extends Command

        // check for security advisories.
        $version = config('firefly.version');
-        $disk    = \Storage::disk('resources');
+        $disk    = Storage::disk('resources');
        // Next line is ignored because it's a Laravel Facade.
        if (!$disk->has('alerts.json')) { // @phpstan-ignore-line
            app('log')->debug('No alerts.json file present.');
--- a/app/Console/Commands/Tools/Cron.php
+++ b/app/Console/Commands/Tools/Cron.php
@@ -31,6 +31,7 @@ use FireflyIII\Support\Cronjobs\AutoBudgetCronjob;
 use FireflyIII\Support\Cronjobs\BillWarningCronjob;
 use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob;
 use FireflyIII\Support\Cronjobs\RecurringCronjob;
+use FireflyIII\Support\Cronjobs\UpdateCheckCronjob;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;

@@ -43,6 +44,7 @@ class Cron extends Command
    protected $signature   = 'firefly-iii:cron
        {--F|force : Force the cron job(s) to execute.}
        {--date= : Set the date in YYYY-MM-DD to make Firefly III think that\'s the current date.}
+        {--check-version : Check if there is a new Firefly III version. Other tasks will be skipped unless also requested.}
        {--download-cer : Download exchange rates. Other tasks will be skipped unless also requested.}
        {--create-recurring : Create recurring transactions. Other tasks will be skipped unless also requested.}
        {--create-auto-budgets : Create auto budgets. Other tasks will be skipped unless also requested.}
@@ -51,7 +53,11 @@ class Cron extends Command

    public function handle(): int
    {
-        $doAll = !$this->option('download-cer') && !$this->option('create-recurring') && !$this->option('create-auto-budgets') && !$this->option('send-bill-warnings');
+        $doAll = !$this->option('download-cer')
+                 && !$this->option('create-recurring')
+                 && !$this->option('create-auto-budgets')
+                 && !$this->option('send-bill-warnings')
+                 && !$this->option('check-version');
        $date  = null;

        try {
@@ -72,6 +78,17 @@ class Cron extends Command
            }
        }

+        // check for new version
+        if ($doAll || $this->option('check-version')) {
+            try {
+                $this->checkForUpdates($force);
+            } catch (FireflyException $e) {
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
+                $this->friendlyError($e->getMessage());
+            }
+        }
+
        // Fire recurring transaction cron job.
        if ($doAll || $this->option('create-recurring')) {
            try {
@@ -204,4 +221,21 @@ class Cron extends Command
            $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
        }
    }
+
+    private function checkForUpdates(bool $force): void
+    {
+        $updateCheck = new UpdateCheckCronjob();
+        $updateCheck->setForce($force);
+        $updateCheck->fire();
+
+        if ($updateCheck->jobErrored) {
+            $this->friendlyError(sprintf('Error in "update check" cron: %s', $updateCheck->message));
+        }
+        if ($updateCheck->jobFired) {
+            $this->friendlyInfo(sprintf('"Update check" cron fired: %s', $updateCheck->message));
+        }
+        if ($updateCheck->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Update check" cron ran with success: %s', $updateCheck->message));
+        }
+    }
 }
--- a/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
+++ b/app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php
@@ -29,6 +29,8 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Preference;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\DB;

 class RemovesDatabaseDecryption extends Command
 {
@@ -101,7 +103,7 @@ class RemovesDatabaseDecryption extends Command

    private function decryptField(string $table, string $field): void
    {
-        $rows = \DB::table($table)->get(['id', $field]);
+        $rows = DB::table($table)->get(['id', $field]);

        /** @var \stdClass $row */
        foreach ($rows as $row) {
@@ -135,7 +137,7 @@ class RemovesDatabaseDecryption extends Command
        }

        if ($value !== $original) {
-            \DB::table($table)->where('id', $id)->update([$field => $value]);
+            DB::table($table)->where('id', $id)->update([$field => $value]);
        }
    }

@@ -151,7 +153,7 @@ class RemovesDatabaseDecryption extends Command
    private function tryDecrypt($value)
    {
        try {
-            $value = \Crypt::decrypt($value);
+            $value = Crypt::decrypt($value);
        } catch (DecryptException $e) {
            if ('The MAC is invalid.' === $e->getMessage()) {
                throw new FireflyException($e->getMessage(), 0, $e);
--- a/app/Console/Commands/Upgrade/RepairsPostgresSequences.php
+++ b/app/Console/Commands/Upgrade/RepairsPostgresSequences.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;

 class RepairsPostgresSequences extends Command
 {
@@ -40,7 +41,7 @@ class RepairsPostgresSequences extends Command
     */
    public function handle(): int
    {
-        if ('pgsql' !== \DB::connection()->getName()) {
+        if ('pgsql' !== DB::connection()->getName()) {
            return 0;
        }
        $this->friendlyLine('Going to verify PostgreSQL table sequences.');
@@ -49,8 +50,8 @@ class RepairsPostgresSequences extends Command
        foreach ($tablesToCheck as $tableToCheck) {
            $this->friendlyLine(sprintf('Checking the next id sequence for table "%s".', $tableToCheck));

-            $highestId = \DB::table($tableToCheck)->select(\DB::raw('MAX(id)'))->first();
-            $nextId    = \DB::table($tableToCheck)->select(\DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))->first();
+            $highestId = DB::table($tableToCheck)->select(DB::raw('MAX(id)'))->first();
+            $nextId    = DB::table($tableToCheck)->select(DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))->first();
            if (null === $nextId) {
                $this->friendlyInfo(sprintf('nextval is NULL for table "%s", go to next table.', $tableToCheck));

@@ -58,9 +59,9 @@ class RepairsPostgresSequences extends Command
            }

            if ($nextId->nextval < $highestId->max) { // @phpstan-ignore-line
-                \DB::select(sprintf('SELECT setval(\'%s_id_seq\', %d)', $tableToCheck, $highestId->max));
-                $highestId = \DB::table($tableToCheck)->select(\DB::raw('MAX(id)'))->first();
-                $nextId    = \DB::table($tableToCheck)->select(\DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))->first();
+                DB::select(sprintf('SELECT setval(\'%s_id_seq\', %d)', $tableToCheck, $highestId->max));
+                $highestId = DB::table($tableToCheck)->select(DB::raw('MAX(id)'))->first();
+                $nextId    = DB::table($tableToCheck)->select(DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))->first();
                if ($nextId->nextval > $highestId->max) { // @phpstan-ignore-line
                    $this->friendlyInfo(sprintf('Table "%s" autoincrement corrected.', $tableToCheck));
                }
--- a/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
+++ b/app/Console/Commands/Upgrade/UpgradesJournalMetaData.php
@@ -31,6 +31,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;

 class UpgradesJournalMetaData extends Command
 {
@@ -86,8 +87,8 @@ class UpgradesJournalMetaData extends Command
        $this->migrateCategories();

        // empty tables
-        \DB::table('budget_transaction')->delete();
-        \DB::table('category_transaction')->delete();
+        DB::table('budget_transaction')->delete();
+        DB::table('category_transaction')->delete();
    }

    private function migrateBudgets(): void
@@ -108,12 +109,12 @@ class UpgradesJournalMetaData extends Command

    private function getIdsForBudgets(): array
    {
-        $transactions = \DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
+        $transactions = DB::table('budget_transaction')->distinct()->pluck('transaction_id')->toArray();
        $array        = [];
        $chunks       = array_chunk($transactions, 500);

        foreach ($chunks as $chunk) {
-            $set   = \DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
+            $set   = DB::table('transactions')->whereIn('transactions.id', $chunk)->pluck('transaction_journal_id')->toArray();
            $array = array_merge($array, $set);
        }

@@ -171,12 +172,12 @@ class UpgradesJournalMetaData extends Command

    private function getIdsForCategories(): array
    {
-        $transactions = \DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
+        $transactions = DB::table('category_transaction')->distinct()->pluck('transaction_id')->toArray();
        $array        = [];
        $chunks       = array_chunk($transactions, 500);

        foreach ($chunks as $chunk) {
-            $set   = \DB::table('transactions')
+            $set   = DB::table('transactions')
                ->whereIn('transactions.id', $chunk)
                ->pluck('transaction_journal_id')->toArray()
            ;
--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;

 class UpgradesToGroups extends Command
 {
@@ -237,7 +238,8 @@ class UpgradesToGroups extends Command
        return [
            'type'                => strtolower($journal->transactionType->type),
            'date'                => $journal->date,
-            'user'                => $journal->user_id,
+            'user'                => $journal->user,
+            'user_group'          => $journal->user->userGroup,
            'currency_id'         => $transaction->transaction_currency_id,
            'foreign_currency_id' => $transaction->foreign_currency_id,
            'amount'              => $transaction->amount,
@@ -364,7 +366,7 @@ class UpgradesToGroups extends Command

    private function giveGroup(array $array): void
    {
-        $groupId = \DB::table('transaction_groups')->insertGetId(
+        $groupId = DB::table('transaction_groups')->insertGetId(
            [
                'created_at' => date('Y-m-d H:i:s'),
                'updated_at' => date('Y-m-d H:i:s'),
@@ -372,7 +374,7 @@ class UpgradesToGroups extends Command
                'user_id'    => $array['user_id'],
            ]
        );
-        \DB::table('transaction_journals')->where('id', $array['id'])->update(['transaction_group_id' => $groupId]);
+        DB::table('transaction_journals')->where('id', $array['id'])->update(['transaction_group_id' => $groupId]);
        ++$this->count;
    }

--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@@ -129,6 +129,11 @@ class GracefulNotFoundHandler extends ExceptionHandler

                return redirect(route('rules.index'));

+            case 'rule-groups.edit':
+                $request->session()->reflash();
+
+                return redirect(route('rules.index'));
+
            case 'transactions.mass.edit':
            case 'transactions.mass.delete':
            case 'transactions.bulk.edit':
--- a/app/Factory/BillFactory.php
+++ b/app/Factory/BillFactory.php
@@ -48,13 +48,16 @@ class BillFactory
    {
        app('log')->debug(sprintf('Now in %s', __METHOD__), $data);
        $factory          = app(TransactionCurrencyFactory::class);
-        $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null)) ??
-                    app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
+        $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null))
+                    ?? app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);

        try {
            $skip   = array_key_exists('skip', $data) ? $data['skip'] : 0;
            $active = array_key_exists('active', $data) ? $data['active'] : 0;

+            $data['extension_date'] ??= null;
+            $data['end_date']       ??= null;
+
            /** @var Bill $bill */
            $bill   = Bill::create(
                [
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@@ -227,12 +227,12 @@ class PiggyBankFactory
        // TODO this is a tedious check. Feels like a hack.
        $toBeLinked = [];
        foreach ($piggyBank->accounts as $account) {
+            Log::debug(sprintf('Checking account #%d', $account->id));
            foreach ($accounts as $info) {
-                if ($account->id === $info['account_id']) {
-                    if (array_key_exists($account->id, $accounts)) {
-                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount ?? '0'];
-                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount ?? '0'));
-                    }
+                Log::debug(sprintf('  Checking other account #%d', $info['account_id']));
+                if ((int) $account->id === (int) $info['account_id']) {
+                    $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount ?? '0'];
+                    Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount ?? '0'));
                }
            }
        }
@@ -244,9 +244,13 @@ class PiggyBankFactory
            if (null === $account) {
                continue;
            }
-            if (array_key_exists('current_amount', $info)) {
+            if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {
                $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
-                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot->current_amount ?? '0'));
+                Log::debug(sprintf('[a] Will link account #%d with amount %s', $account->id, $info['current_amount']));
+            }
+            if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {
+                $toBeLinked[$account->id] = ['current_amount' => $toBeLinked[$account->id]['current_amount'] ?? '0'];
+                Log::debug(sprintf('[b] Will link account #%d with amount %s', $account->id, $toBeLinked[$account->id]['current_amount'] ?? '0'));
            }
            if (!array_key_exists('current_amount', $info)) {
                $toBeLinked[$account->id] ??= [];
--- a/app/Factory/TagFactory.php
+++ b/app/Factory/TagFactory.php
@@ -76,7 +76,7 @@ class TagFactory
        $longitude = 0.0 === (float) $data['longitude'] ? null : (float) $data['longitude']; // intentional float
        $array     = [
            'user_id'       => $this->user->id,
-            'user_group_id' => $this->user->user_group_id,
+            'user_group_id' => $this->userGroup->id,
            'tag'           => trim($data['tag']),
            'tagMode'       => 'nothing',
            'date'          => $data['date'],
--- a/app/Factory/TransactionGroupFactory.php
+++ b/app/Factory/TransactionGroupFactory.php
@@ -79,7 +79,7 @@ class TransactionGroupFactory

        $group        = new TransactionGroup();
        $group->user()->associate($this->user);
-        $group->userGroup()->associate($data['user_group']);
+        $group->userGroup()->associate($this->userGroup);
        $group->title = $title;
        $group->save();

@@ -93,7 +93,8 @@ class TransactionGroupFactory
     */
    public function setUser(User $user): void
    {
-        $this->user = $user;
+        $this->user      = $user;
+        $this->userGroup = $user->userGroup;
    }

    public function setUserGroup(UserGroup $userGroup): void
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@@ -41,7 +41,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
 use FireflyIII\Support\Facades\FireflyConfig;
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -136,6 +136,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
        ;
        $journals          = $collector->getExtractedJournals();
        $journals          = array_reverse($journals, true);
+        // this call is correct.
        Log::debug(sprintf('getAuditReport: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
        $dayBeforeBalance  = Steam::finalAccountBalance($account, $date);
        $startBalance      = $dayBeforeBalance['balance'];
@@ -171,6 +172,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
            $journals[$index]['invoice_date']   = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
        }
        $locale            = app('steam')->getLocale();
+        // call is correct.
        Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));

        return [
--- a/app/Handlers/Events/PreferencesEventHandler.php
+++ b/app/Handlers/Events/PreferencesEventHandler.php
@@ -28,8 +28,8 @@ use FireflyIII\Events\Preferences\UserGroupChangedDefaultCurrency;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\Artisan;
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use Illuminate\Support\Facades\Log;

 /**
 * Class VersionCheckEventHandler
@@ -45,13 +46,13 @@ class VersionCheckEventHandler
     */
    public function checkForUpdates(RequestedVersionCheckStatus $event): void
    {
-        app('log')->debug('Now in checkForUpdates()');
+        Log::debug('Now in checkForUpdates()');

        // should not check for updates:
        $permission    = app('fireflyconfig')->get('permission_update_check', -1);
        $value         = (int) $permission->data;
        if (1 !== $value) {
-            app('log')->debug('Update check is not enabled.');
+            Log::debug('Update check is not enabled.');
            $this->warnToCheckForUpdates($event);

            return;
@@ -61,7 +62,7 @@ class VersionCheckEventHandler
        $repository    = app(UserRepositoryInterface::class);
        $user          = $event->user;
        if (!$repository->hasRole($user, 'owner')) {
-            app('log')->debug('User is not admin, done.');
+            Log::debug('User is not admin, done.');

            return;
        }
@@ -70,14 +71,14 @@ class VersionCheckEventHandler
        $lastCheckTime = app('fireflyconfig')->get('last_update_check', time());
        $now           = time();
        $diff          = $now - $lastCheckTime->data;
-        app('log')->debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
+        Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
        if ($diff < 604800) {
-            app('log')->debug(sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
+            Log::debug(sprintf('Checked for updates less than a week ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));

            return;
        }
        // last check time was more than a week ago.
-        app('log')->debug('Have not checked for a new version in a week!');
+        Log::debug('Have not checked for a new version in a week!');
        $release       = $this->getLatestRelease();

        session()->flash($release['level'], $release['message']);
@@ -93,7 +94,7 @@ class VersionCheckEventHandler
        $repository    = app(UserRepositoryInterface::class);
        $user          = $event->user;
        if (!$repository->hasRole($user, 'owner')) {
-            app('log')->debug('User is not admin, done.');
+            Log::debug('User is not admin, done.');

            return;
        }
@@ -102,14 +103,14 @@ class VersionCheckEventHandler
        $lastCheckTime = app('fireflyconfig')->get('last_update_warning', time());
        $now           = time();
        $diff          = $now - $lastCheckTime->data;
-        app('log')->debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
+        Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
        if ($diff < 604800 * 4) {
-            app('log')->debug(sprintf('Warned about updates less than four weeks ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));
+            Log::debug(sprintf('Warned about updates less than four weeks ago (on %s).', date('Y-m-d H:i:s', $lastCheckTime->data)));

            return;
        }
        // last check time was more than a week ago.
-        app('log')->debug('Have warned about a new version in four weeks!');
+        Log::debug('Have warned about a new version in four weeks!');

        session()->flash('info', (string) trans('firefly.disabled_but_check'));
        app('fireflyconfig')->set('last_update_warning', time());
--- a/app/Handlers/Observer/AccountObserver.php
+++ b/app/Handlers/Observer/AccountObserver.php
@@ -26,11 +26,14 @@ namespace FireflyIII\Handlers\Observer;

 use FireflyIII\Models\Account;
 use FireflyIII\Models\Attachment;
-use FireflyIII\Models\PiggyBank;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

 /**
@@ -72,24 +75,32 @@ class AccountObserver
     */
    public function deleting(Account $account): void
    {
-        //        app('log')->debug('Observe "deleting" of an account.');
-        $account->accountMeta()->delete();
+        app('log')->debug('Observe "deleting" of an account.');

        $repository = app(AttachmentRepositoryInterface::class);
        $repository->setUser($account->user);

-        /** @var PiggyBank $piggy */
-        foreach ($account->piggyBanks()->get() as $piggy) {
-            $piggy->accounts()->detach($account);
-        }
+        DB::table('account_piggy_bank')->where('account_id', $account->id)->delete();

        /** @var Attachment $attachment */
        foreach ($account->attachments()->get() as $attachment) {
            $repository->destroy($attachment);
        }
-        foreach ($account->transactions()->get() as $transaction) {
-            $transaction->delete();
+
+        $journalIds = Transaction::where('account_id', $account->id)->get(['transactions.transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+        $groupIds   = TransactionJournal::whereIn('id', $journalIds)->get(['transaction_journals.transaction_group_id'])->pluck('transaction_group_id')->toArray(); // @phpstan-ignore-line
+
+        if (count($journalIds) > 0) {
+            Transaction::whereIn('transaction_journal_id', $journalIds)->delete();
+            TransactionJournal::whereIn('id', $journalIds)->delete();
        }
+        if (count($groupIds) > 0) {
+            TransactionGroup::whereIn('id', $groupIds)->delete();
+        }
+
+        Log::debug(sprintf('Delete %d journal(s)', count($journalIds)));
+        Log::debug(sprintf('Delete %d group(s)', count($groupIds)));
+
        $account->notes()->delete();
        $account->locations()->delete();
    }
--- a/app/Helpers/Attachments/AttachmentHelper.php
+++ b/app/Helpers/Attachments/AttachmentHelper.php
@@ -31,6 +31,7 @@ use Illuminate\Contracts\Encryption\EncryptException;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\MessageBag;
@@ -70,7 +71,7 @@ class AttachmentHelper implements AttachmentHelperInterface
        $encryptedData = (string) $this->uploadDisk->get(sprintf('at-%d.data', $attachment->id));

        try {
-            $unencryptedData = \Crypt::decrypt($encryptedData); // verified
+            $unencryptedData = Crypt::decrypt($encryptedData); // verified
        } catch (DecryptException $e) {
            Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
            $unencryptedData = $encryptedData;
--- a/app/Helpers/Report/NetWorth.php
+++ b/app/Helpers/Report/NetWorth.php
@@ -30,8 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -48,12 +47,10 @@ use Illuminate\Support\Facades\Log;
 */
 class NetWorth implements NetWorthInterface
 {
-    private AccountRepositoryInterface      $accountRepository;
-    private AdminAccountRepositoryInterface $adminAccountRepository;
-
+    private AccountRepositoryInterface  $accountRepository;
    private CurrencyRepositoryInterface $currencyRepos;
-    private User                        $user;
-    private ?UserGroup                  $userGroup;
+    private User                        $user; // @phpstan-ignore-line
+    private ?UserGroup                  $userGroup; // @phpstan-ignore-line

    /**
     * This method collects the user's net worth in ALL the user's currencies
@@ -85,7 +82,7 @@ class NetWorth implements NetWorthInterface
        /** @var Account $account */
        foreach ($accounts as $account) {
            Log::debug(sprintf('Now at account #%d ("%s")', $account->id, $account->name));
-            $currency                           = $this->getRepository()->getAccountCurrency($account) ?? $default;
+            $currency                           = $this->accountRepository->getAccountCurrency($account) ?? $default;
            $useNative                          = $convertToNative && $default->id !== $currency->id;
            $currency                           = $useNative ? $default : $currency;
            $currencyCode                       = $currency->code;
@@ -118,36 +115,23 @@ class NetWorth implements NetWorthInterface
        return $netWorth;
    }

-    private function getRepository(): AccountRepositoryInterface|AdminAccountRepositoryInterface
-    {
-        if (null === $this->userGroup) {
-            return $this->accountRepository;
-        }
-
-        return $this->adminAccountRepository;
-    }
-
    public function setUser(null|Authenticatable|User $user): void
    {
        if (!$user instanceof User) {
            return;
        }
-        $this->user              = $user;
-        $this->userGroup         = null;
-
-        // make repository:
-        $this->accountRepository = app(AccountRepositoryInterface::class);
-        $this->accountRepository->setUser($this->user);
-
-        $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
-        $this->currencyRepos->setUser($this->user);
+        $this->user = $user;
+        $this->setUserGroup($user->userGroup);
    }

    public function setUserGroup(UserGroup $userGroup): void
    {
-        $this->userGroup              = $userGroup;
-        $this->adminAccountRepository = app(AdminAccountRepositoryInterface::class);
-        $this->adminAccountRepository->setUserGroup($userGroup);
+        $this->userGroup         = $userGroup;
+        $this->accountRepository = app(AccountRepositoryInterface::class);
+        $this->accountRepository->setUserGroup($userGroup);
+
+        $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
+        $this->currencyRepos->setUserGroup($this->userGroup);
    }

    /**
@@ -163,7 +147,7 @@ class NetWorth implements NetWorthInterface
        Log::debug(sprintf('SumNetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));
        $balances = Steam::finalAccountsBalance($accounts, $date);
        foreach ($accounts as $account) {
-            $currency                     = $this->getRepository()->getAccountCurrency($account);
+            $currency                     = $this->accountRepository->getAccountCurrency($account);
            $balance                      = $balances[$account->id]['balance'] ?? '0';

            // always subtract virtual balance.
@@ -188,14 +172,14 @@ class NetWorth implements NetWorthInterface

    private function getAccounts(): Collection
    {
-        $accounts = $this->getRepository()->getAccountsByType(
+        $accounts = $this->accountRepository->getAccountsByType(
            [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value]
        );
        $filtered = new Collection();

        /** @var Account $account */
        foreach ($accounts as $account) {
-            if (1 === (int) $this->getRepository()->getMetaValue($account, 'include_net_worth')) {
+            if (1 === (int) $this->accountRepository->getMetaValue($account, 'include_net_worth')) {
                $filtered->push($account);
            }
        }
--- a/app/Helpers/Report/PopupReport.php
+++ b/app/Helpers/Report/PopupReport.php
@@ -30,7 +30,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;

 /**
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -115,6 +115,7 @@ class ReconcileController extends Controller

        $startDate       = clone $start;
        $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59
+        // both are validated and are correct.
        Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
        Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
        $startBalance    = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
@@ -224,11 +225,13 @@ class ReconcileController extends Controller
            ]
        );
        $submission     = [
-            'user'         => auth()->user()->id,
-            'group_title'  => null,
-            'transactions' => [
+            'user'               => auth()->user(),
+            'user_group'         => auth()->user()->userGroup,
+            'group_title'        => null,
+            'transactions'       => [
                [
-                    'user'                => auth()->user()->id,
+                    'user'                => auth()->user(),
+                    'user_group'          => auth()->user()->userGroup,
                    'type'                => strtolower(TransactionTypeEnum::RECONCILIATION->value),
                    'date'                => $end,
                    'order'               => 0,
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -30,8 +30,10 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Debug\Timer;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -80,6 +82,7 @@ class ShowController extends Controller
     *                                              */
    public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
    {
+
        $objectType       = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));

        if (!$this->isEditableAccount($account)) {
@@ -112,32 +115,57 @@ class ShowController extends Controller
        $subTitle         = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
        $chartUrl         = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
        $firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
+
+        Log::debug('Start period overview');
+        Timer::start('period-overview');
+
        $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);

+        Log::debug('End period overview');
+        Timer::stop('period-overview');
+
        // if layout = v2, overrule the page title.
        if ('v1' !== config('view.layout')) {
            $subTitle = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
        }
+        Log::debug('Collect transactions');
+        Timer::start('collection');

        /** @var GroupCollectorInterface $collector */
        $collector        = app(GroupCollectorInterface::class);
        $collector
            ->setAccounts(new Collection([$account]))
            ->setLimit($pageSize)
-            ->setPage($page)->withAccountInformation()->withCategoryInformation()
+            ->setPage($page)
+            ->withAPIInformation()
            ->setRange($start, $end)
        ;
-
        // this search will not include transaction groups where this asset account (or liability)
        // is just part of ONE of the journals. To force this:
        $collector->setExpandGroupSearch(true);
-
        $groups           = $collector->getPaginatedGroups();

+        Log::debug('End collect transactions');
+        Timer::stop('collection');
+
+        // enrich data in arrays.
+
+        // enrich
+        //        $enrichment   = new TransactionGroupEnrichment();
+        //        $enrichment->setUser(auth()->user());
+        //        $groups->setCollection($enrichment->enrich($groups->getCollection()));
+
+
        $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
        $showAll          = false;
-        Log::debug(sprintf('show: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
-        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
+        // correct
+        $now              = today()->endOfDay();
+        if ($now->gt($end) || $now->lt($start)) {
+            $now = $end;
+        }
+
+        Log::debug(sprintf('show: Call finalAccountBalance with date/time "%s"', $now->toIso8601String()));
+        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToNative, $accountCurrency);

        return view(
            'accounts.show',
@@ -202,6 +230,7 @@ class ShowController extends Controller
        $groups->setPath(route('accounts.show.all', [$account->id]));
        $chartUrl        = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
        $showAll         = true;
+        // correct
        Log::debug(sprintf('showAll: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
        $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);

--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Http\Controllers\Admin;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\ConfigurationRequest;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
@@ -68,8 +69,8 @@ class ConfigurationController extends Controller

        // all available configuration and their default value in case
        // they don't exist yet.
-        $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        $isDemoSite     = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $isDemoSite     = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
        $siteOwner      = config('firefly.site_owner');

        return view(
@@ -89,8 +90,8 @@ class ConfigurationController extends Controller
        Log::channel('audit')->info('User updates global configuration.', $data);

        // store config values
-        app('fireflyconfig')->set('single_user_mode', $data['single_user_mode']);
-        app('fireflyconfig')->set('is_demo_site', $data['is_demo_site']);
+        FireflyConfig::set('single_user_mode', $data['single_user_mode']);
+        FireflyConfig::set('is_demo_site', $data['is_demo_site']);

        // flash message
        session()->flash('success', (string) trans('firefly.configuration_updated'));
--- a/app/Http/Controllers/Admin/NotificationController.php
+++ b/app/Http/Controllers/Admin/NotificationController.php
@@ -28,6 +28,7 @@ use FireflyIII\Events\Test\OwnerTestNotificationChannel;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\NotificationRequest;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -44,14 +45,14 @@ class NotificationController extends Controller
        $subTitleIcon                   = 'envelope-o';

        // notification settings:
-        $slackUrl                       = app('fireflyconfig')->getEncrypted('slack_webhook_url', '')->data;
-        $pushoverAppToken               = app('fireflyconfig')->getEncrypted('pushover_app_token', '')->data;
-        $pushoverUserToken              = app('fireflyconfig')->getEncrypted('pushover_user_token', '')->data;
-        $ntfyServer                     = app('fireflyconfig')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
-        $ntfyTopic                      = app('fireflyconfig')->getEncrypted('ntfy_topic', '')->data;
-        $ntfyAuth                       = app('fireflyconfig')->get('ntfy_auth', false)->data;
-        $ntfyUser                       = app('fireflyconfig')->getEncrypted('ntfy_user', '')->data;
-        $ntfyPass                       = app('fireflyconfig')->getEncrypted('ntfy_pass', '')->data;
+        $slackUrl                       = FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
+        $pushoverAppToken               = FireflyConfig::getEncrypted('pushover_app_token', '')->data;
+        $pushoverUserToken              = FireflyConfig::getEncrypted('pushover_user_token', '')->data;
+        $ntfyServer                     = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
+        $ntfyTopic                      = FireflyConfig::getEncrypted('ntfy_topic', '')->data;
+        $ntfyAuth                       = FireflyConfig::get('ntfy_auth', false)->data;
+        $ntfyUser                       = FireflyConfig::getEncrypted('ntfy_user', '')->data;
+        $ntfyPass                       = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
        $channels                       = config('notifications.channels');
        $forcedAvailability             = [];

@@ -59,7 +60,7 @@ class NotificationController extends Controller
        $notifications                  = [];
        foreach (config('notifications.notifications.owner') as $key => $info) {
            if (true === $info['enabled']) {
-                $notifications[$key] = app('fireflyconfig')->get(sprintf('notification_%s', $key), true)->data;
+                $notifications[$key] = FireflyConfig::get(sprintf('notification_%s', $key), true)->data;
            }
        }

@@ -98,19 +99,19 @@ class NotificationController extends Controller

        foreach (config('notifications.notifications.owner') as $key => $info) {
            if (array_key_exists($key, $all)) {
-                app('fireflyconfig')->set(sprintf('notification_%s', $key), $all[$key]);
+                FireflyConfig::set(sprintf('notification_%s', $key), $all[$key]);
            }
        }
        $variables = ['slack_webhook_url', 'pushover_app_token', 'pushover_user_token', 'ntfy_server', 'ntfy_topic', 'ntfy_user', 'ntfy_pass'];
        foreach ($variables as $variable) {
            if ('' === $all[$variable]) {
-                app('fireflyconfig')->delete($variable);
+                FireflyConfig::delete($variable);
            }
            if ('' !== $all[$variable]) {
-                app('fireflyconfig')->setEncrypted($variable, $all[$variable]);
+                FireflyConfig::setEncrypted($variable, $all[$variable]);
            }
        }
-        app('fireflyconfig')->set('ntfy_auth', $all['ntfy_auth'] ?? false);
+        FireflyConfig::set('ntfy_auth', $all['ntfy_auth'] ?? false);


        session()->flash('success', (string) trans('firefly.notification_settings_saved'));
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -41,6 +41,7 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;

@@ -223,7 +224,7 @@ class LoginController extends Controller
    {
        Log::channel('audit')->info('Show login form (1.1).');

-        $count             = \DB::table('users')->count();
+        $count             = DB::table('users')->count();
        $guard             = config('auth.defaults.guard');
        $title             = (string) trans('firefly.login_page_title');

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions	fc98d66ef4	Auto commit for release 'develop' on 2025-03-14	2025-03-14 17:45:16 +01:00
James Cole	f6642c075d	Merge pull request #9969 from firefly-iii/fix-9770 Fix #9770	2025-03-13 20:24:50 +01:00
James Cole	458a337521	Fix #9770	2025-03-13 20:23:53 +01:00
James Cole	37d2299a1d	Merge pull request #9957 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-2.1.8 Bump phpstan/phpstan from 2.1.7 to 2.1.8	2025-03-10 05:51:33 +01:00
James Cole	f69cffc50b	Merge pull request #9958 from firefly-iii/dependabot/npm_and_yarn/develop/axios-1.8.2 Bump axios from 1.8.1 to 1.8.2	2025-03-10 05:51:22 +01:00
James Cole	fd77a17ba5	Merge pull request #9959 from firefly-iii/dependabot/npm_and_yarn/develop/vite-6.2.1 Bump vite from 6.2.0 to 6.2.1	2025-03-10 05:51:11 +01:00
dependabot[bot]	b481cf53e7	Bump vite from 6.2.0 to 6.2.1 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@6.2.1/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-10 03:41:58 +00:00
dependabot[bot]	a4a4590c45	Bump axios from 1.8.1 to 1.8.2 Bumps [axios](https://github.com/axios/axios) from 1.8.1 to 1.8.2. - [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.8.1...v1.8.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-10 03:41:42 +00:00
dependabot[bot]	9e398beb07	Bump phpstan/phpstan from 2.1.7 to 2.1.8 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 2.1.7 to 2.1.8. - [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.7...2.1.8) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-10 03:19:15 +00:00
James Cole	38ae3df423	Merge pull request #9955 from firefly-iii/fix-9954 Fix #9954	2025-03-09 18:45:04 +01:00
James Cole	2f17701b68	Fix #9954	2025-03-09 18:44:39 +01:00
James Cole	4c797c1d4c	Merge pull request #9953 from firefly-iii/fix-9876 Fix #9876	2025-03-09 10:35:38 +01:00
James Cole	a8e1c22c93	Fix #9876	2025-03-09 10:35:12 +01:00
James Cole	b60021e0ce	Merge pull request #9952 from firefly-iii/speed-up-account-show Speed up account show	2025-03-09 09:57:24 +01:00
James Cole	453ccd3271	Clean up overview.	2025-03-09 09:54:14 +01:00
James Cole	08f13aebe3	Fix period overview for account	2025-03-09 09:54:06 +01:00
James Cole	26df1be871	Remove debug	2025-03-09 09:53:52 +01:00
James Cole	fe2def9684	Fix nullpointer.	2025-03-09 09:53:36 +01:00
James Cole	db2cab3cef	Add custom method.	2025-03-09 09:53:27 +01:00
James Cole	d84405191f	Add debug timers.	2025-03-09 09:53:19 +01:00
James Cole	349d32a268	Merge pull request #9951 from firefly-iii/fix-phpstan-issues Various code cleanup and sorting.	2025-03-08 19:55:51 +01:00
James Cole	30b7e17b6f	Various code cleanup and sorting.	2025-03-08 19:55:21 +01:00
James Cole	2d3d3bc0a4	Merge pull request #9950 from firefly-iii/fix-9948 Fix #9948	2025-03-08 19:35:03 +01:00
James Cole	a4f887921a	Fix #9948	2025-03-08 19:34:18 +01:00
James Cole	710732d7f5	Merge pull request #9949 from firefly-iii/missing-phpstan-methods Missing phpstan methods	2025-03-08 15:58:27 +01:00
James Cole	cd08c16dee	Replace missing methods.	2025-03-08 15:57:59 +01:00
James Cole	a8f36a2490	Add missing methods so phpstan stops complaining.	2025-03-08 15:52:50 +01:00
James Cole	7f12d06989	Merge pull request #9947 from firefly-iii/remove-usergroup-repositories Remove references to user group specific repositories and instead use…	2025-03-08 15:12:13 +01:00
James Cole	8eb0313841	Remove references to user group specific repositories and instead use the normal ones.	2025-03-08 15:10:24 +01:00
James Cole	113eb84461	Merge pull request #9946 from firefly-iii/fix-currency-autocomplete Add missing method to repository.	2025-03-08 05:57:19 +01:00
mergify[bot]	cdf42e50f0	Merge branch 'develop' into fix-currency-autocomplete	2025-03-08 04:56:06 +00:00
James Cole	e59cf03d80	Merge branch 'main' into develop # Conflicts: # composer.lock	2025-03-08 05:55:45 +01:00
James Cole	0bd0e6caeb	Add missing method to repository.	2025-03-08 05:51:50 +01:00
James Cole	605623a7af	Merge pull request #9944 from firefly-iii/add-validation-command Add command to validate various settings.	2025-03-08 05:50:47 +01:00
James Cole	042d055d85	Merge pull request #9945 from firefly-iii/mergify/JC5/config-update ci(Mergify): configuration update	2025-03-08 05:45:27 +01:00
James Cole	cc29d0a850	ci(Mergify): configuration update Signed-off-by: James Cole <james@firefly-iii.org>	2025-03-08 05:45:00 +01:00
James Cole	7dede49aee	Add command to validate various settings.	2025-03-08 05:38:51 +01:00
James Cole	775282ae02	Fix #9941	2025-03-07 05:25:43 +01:00
James Cole	e49806078a	Merge pull request #9935 from firefly-iii/dependabot/composer/composer-e6d0169aed	2025-03-06 05:28:45 +01:00
dependabot[bot]	71d8c0d219	Bump laravel/framework in the composer group across 1 directory Bumps the composer group with 1 update in the / directory: [laravel/framework](https://github.com/laravel/framework). Updates `laravel/framework` from 11.43.2 to 11.44.1 - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/12.x/CHANGELOG.md) - [Commits](https://github.com/laravel/framework/compare/v11.43.2...v11.44.1) --- updated-dependencies: - dependency-name: laravel/framework dependency-type: direct:production dependency-group: composer ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-05 23:45:21 +00:00
James Cole	0031c5a5ad	Fix #9914	2025-03-05 20:12:44 +01:00
James Cole	3ce111550e	Merge branch 'main' into develop	2025-03-05 19:53:29 +01:00
James Cole	58af83cc8c	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # .ci/php-cs-fixer/composer.lock	2025-03-05 19:52:36 +01:00
github-actions	422a23e700	Auto commit for release 'develop' on 2025-03-05	2025-03-05 15:50:17 +01:00
Sander Dorigo	8c2672cdf8	Fix #9895	2025-03-05 15:02:40 +01:00
Sander Dorigo	764e49985b	add default values	2025-03-05 14:58:10 +01:00
Sander Dorigo	84251f8f10	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-03-05 14:42:34 +01:00
James Cole	3d878cb5dd	Merge pull request #9899 from firefly-iii/dependabot/github_actions/github/command-2.0.0 Bump github/command from 1.3.0 to 2.0.0	2025-03-05 12:28:06 +01:00
Sander Dorigo	8b4740d28c	fix #9902	2025-03-05 12:27:08 +01:00
James Cole	0845e265c2	Merge pull request #9903 from lompi/add_support_for_strpos_in_expressions Add support for PHP function `strpos` in expressions	2025-03-05 12:25:50 +01:00
Sander Dorigo	b4455a3802	Fix #9906	2025-03-05 12:18:14 +01:00
Sander Dorigo	8d12d47691	fix #9908	2025-03-05 12:13:56 +01:00
James Cole	3dc01b0d5c	Merge pull request #9918 from firefly-iii/dependabot/composer/develop/diglactic/laravel-breadcrumbs-10.0.0 Bump diglactic/laravel-breadcrumbs from 9.0.0 to 10.0.0	2025-03-05 11:44:32 +01:00
dependabot[bot]	b442645280	Bump diglactic/laravel-breadcrumbs from 9.0.0 to 10.0.0 Bumps [diglactic/laravel-breadcrumbs](https://github.com/diglactic/laravel-breadcrumbs) from 9.0.0 to 10.0.0. - [Release notes](https://github.com/diglactic/laravel-breadcrumbs/releases) - [Upgrade guide](https://github.com/diglactic/laravel-breadcrumbs/blob/main/UPGRADE.md) - [Commits](https://github.com/diglactic/laravel-breadcrumbs/compare/v9.0.0...v10.0.0) --- updated-dependencies: - dependency-name: diglactic/laravel-breadcrumbs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-03 03:20:25 +00:00
github-actions	eda2b5f822	Auto commit for release 'develop' on 2025-03-03	2025-03-03 04:14:36 +01:00
Lompi	d9593db5e2	Add support for PHP function `strpos` in expressions Signed-off-by: Lompi <lompi91+github_com@gmail.com>	2025-02-24 16:55:00 +01:00
dependabot[bot]	9dcb8e2680	Bump github/command from 1.3.0 to 2.0.0 Bumps [github/command](https://github.com/github/command) from 1.3.0 to 2.0.0. - [Release notes](https://github.com/github/command/releases) - [Commits](https://github.com/github/command/compare/v1.3.0...v2.0.0) --- updated-dependencies: - dependency-name: github/command dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-02-24 03:51:39 +00:00
github-actions	56bac9fc97	Auto commit for release 'develop' on 2025-02-24	2025-02-24 04:13:39 +01:00
James Cole	f7ad9c56c8	Add imports for facades	2025-02-23 12:47:04 +01:00
James Cole	0086a0ddc8	Fix namespace.	2025-02-23 12:35:13 +01:00
James Cole	25ebfd6978	php cs cleanup	2025-02-23 12:28:43 +01:00
James Cole	de8149137a	Use trait and interface.	2025-02-23 12:28:27 +01:00
James Cole	79ae110368	Update php cs fixer	2025-02-23 12:27:49 +01:00
James Cole	60aef0de1a	Mark as deprecated.	2025-02-23 12:27:34 +01:00
James Cole	8d464962a8	Remove methods, point to interface.	2025-02-23 12:27:07 +01:00
github-actions	b93cfc5de2	Auto commit for release 'develop' on 2025-02-22	2025-02-22 17:26:08 +01:00
github-actions	d41f5b1090	Auto commit for release 'v6.2.9' on 2025-02-22	2025-02-22 17:20:52 +01:00
James Cole	40322813c9	Also include user group	2025-02-22 17:17:28 +01:00
James Cole	4a98927e32	Update changelog.	2025-02-22 17:16:30 +01:00
James Cole	193e529803	Fix #9887	2025-02-22 17:16:20 +01:00
github-actions	fbf20ef2c2	Auto commit for release 'v6.2.8' on 2025-02-22	2025-02-22 12:30:53 +01:00
github-actions	54de829c8a	Merge branch 'develop'	2025-02-22 11:28:39 +00:00
James Cole	131b987561	Remove TZ	2025-02-22 12:27:22 +01:00
James Cole	dce6754c62	Merge branch 'main' into develop	2025-02-22 10:27:58 +01:00
James Cole	f4bca90080	Add time and time zone perhaps?	2025-02-22 10:25:31 +01:00
James Cole	b2960b1ed9	Remove docker ignore, not useful in this context.	2025-02-22 10:20:55 +01:00
James Cole	33f87bce23	Merge branch 'main' into develop	2025-02-22 10:20:31 +01:00
James Cole	23aa45609b	Remove files from zip.	2025-02-22 10:20:23 +01:00
github-actions	b098952f82	Auto commit for release 'develop' on 2025-02-22	2025-02-22 10:16:15 +01:00
James Cole	68c3e14b0c	Update changelog.	2025-02-22 10:12:30 +01:00
James Cole	19d08137a5	Fix #9887	2025-02-22 10:06:59 +01:00
James Cole	73776e7869	Fix #9887	2025-02-22 10:05:44 +01:00
github-actions	bf04ca12c1	Auto commit for release 'develop' on 2025-02-22	2025-02-22 08:18:27 +01:00
James Cole	a4637debe9	Update changelog, fix log reference.	2025-02-22 08:07:52 +01:00
James Cole	48c1b525be	Fix #9874	2025-02-22 08:03:42 +01:00
github-actions	56470bfbba	Auto commit for release 'develop' on 2025-02-21	2025-02-21 08:32:55 +01:00
James Cole	0f732ca874	Merge pull request #9880 from josegonzalez/patch-1 fix: ignore the Procfile when building the docker image	2025-02-21 08:06:04 +01:00
James Cole	e452ba938d	Update changelog.	2025-02-21 06:20:17 +01:00
James Cole	9921c5a925	Fix #9882	2025-02-21 06:18:11 +01:00
Jose Diaz-Gonzalez	58fab75681	fix: ignore the Procfile when building the docker image The Procfile is heroku-specific, causing issues on platforms which respect it when specifying processes to run for docker image or dockerfile based deploys. Closes #9833 Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>	2025-02-20 14:51:04 -05:00
Sander Dorigo	54990308f6	fix type error	2025-02-20 12:58:38 +01:00
github-actions	f95758ff47	Auto commit for release 'develop' on 2025-02-20	2025-02-20 08:11:36 +01:00
James Cole	8d830e178f	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-02-20 08:08:18 +01:00
James Cole	334a521ca1	Better fix for nullpointer.	2025-02-20 08:08:07 +01:00
github-actions	12629a1955	Auto commit for release 'develop' on 2025-02-20	2025-02-20 08:00:12 +01:00
James Cole	2e3669a32f	Fix #9871	2025-02-20 07:43:32 +01:00
James Cole	ea337607c4	Fix #9868	2025-02-20 07:30:30 +01:00
James Cole	f7f317a3b2	Fix #9863	2025-02-20 07:28:24 +01:00
James Cole	adbf6defe5	Catch nullpointer.	2025-02-20 06:21:29 +01:00
github-actions	e0709f2975	Auto commit for release 'develop' on 2025-02-19	2025-02-19 09:14:18 +01:00
James Cole	30007b05cb	Fix #9861	2025-02-19 06:37:40 +01:00
James Cole	13fc7f0d8d	Fix #9862	2025-02-19 06:21:27 +01:00
github-actions	7c85138115	Auto commit for release 'v6.2.7' on 2025-02-18	2025-02-18 19:52:25 +01:00
James Cole	2c25f65f7f	Expand changelog.	2025-02-18 19:46:01 +01:00
github-actions	7eaba962e8	Auto commit for release 'develop' on 2025-02-18	2025-02-18 15:17:06 +01:00
Sander Dorigo	7c38393cde	merge	2025-02-18 15:12:42 +01:00
Sander Dorigo	153fd2ae74	fix missing var	2025-02-18 15:06:51 +01:00
github-actions	c0204c810c	Auto commit for release 'develop' on 2025-02-18	2025-02-18 10:31:05 +01:00
Sander Dorigo	944c107e26	Add enrichment	2025-02-18 10:26:36 +01:00
Sander Dorigo	18e05c06fd	Catch nullpointer	2025-02-18 10:24:23 +01:00
Sander Dorigo	fb79dbf17c	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-02-18 10:22:42 +01:00
github-actions	31a8163c61	Auto commit for release 'develop' on 2025-02-17	2025-02-17 16:52:58 +01:00
Sander Dorigo	8bcd729250	remove unused script	2025-02-17 16:49:00 +01:00
Sander Dorigo	80c4e69528	Fix #9848	2025-02-17 13:43:43 +01:00
github-actions	7f6d8fdb87	Auto commit for release 'develop' on 2025-02-17	2025-02-17 13:37:44 +01:00
Sander Dorigo	c8e301326e	Fix #9855	2025-02-17 13:32:07 +01:00
github-actions	4820ef6580	Auto commit for release 'develop' on 2025-02-17	2025-02-17 04:11:50 +01:00
James Cole	4cb775cf4b	Various code cleanup.	2025-02-16 19:45:31 +01:00
James Cole	c371662c51	Fix missing method.	2025-02-16 19:38:07 +01:00
James Cole	ffaa164aa5	Replace facade	2025-02-16 19:32:50 +01:00
James Cole	344bfbe059	Various includes fixed, optimize account deletion.	2025-02-16 19:30:40 +01:00
James Cole	6c38b87ec5	Fix #9842	2025-02-16 07:23:03 +01:00
James Cole	dfcd5d79be	Fix preferences.	2025-02-16 06:33:53 +01:00
James Cole	07631eea28	Add some debug logging.	2025-02-15 20:51:43 +01:00
James Cole	26c4fe36cc	Fix #9803	2025-02-15 19:19:23 +01:00
James Cole	90fc4b44f2	A lot less queries for the account transformer.	2025-02-15 16:51:13 +01:00
James Cole	f755dd2d48	Fix nullpointer	2025-02-15 16:46:25 +01:00
James Cole	d2647f96e7	Fix type error.	2025-02-15 15:44:21 +01:00
James Cole	9f94ec067a	Greatly reduce number of queries in transaction transformer.	2025-02-15 14:10:54 +01:00
James Cole	a795755618	Fix #9835	2025-02-15 07:24:31 +01:00
James Cole	8457a1c881	Add cron routine for update.	2025-02-15 06:12:02 +01:00
James Cole	fc9429bf3e	Fix #9835	2025-02-15 05:39:21 +01:00
James Cole	b6e8b66035	Make sure user_group_id is rendered as int where relevant.	2025-02-15 05:38:40 +01:00
github-actions	7504b21c3e	Auto commit for release 'develop' on 2025-02-12	2025-02-12 20:11:21 +01:00
github-actions	b7dad8166d	Auto commit for release 'v6.2.6' on 2025-02-12	2025-02-12 20:06:45 +01:00
James Cole	2da1b43c37	Expand changelog.	2025-02-12 20:01:45 +01:00
James Cole	a606315884	Fix balance display #9826	2025-02-12 11:53:51 +01:00
github-actions	295feedd77	Auto commit for release 'develop' on 2025-02-12	2025-02-12 10:50:48 +01:00
James Cole	d3b2748c8f	Ok this fix for #9797 goes out to @nebster9k who is delightfully stubborn and absolutely correct.	2025-02-12 06:38:21 +01:00
James Cole	1b4655fd70	Fix #9821	2025-02-12 06:06:28 +01:00
Sander Dorigo	05f67ef584	Fix #9810	2025-02-11 16:27:18 +01:00
Sander Dorigo	04ab7ba07d	qMerge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-02-11 16:10:48 +01:00
Sander Dorigo	5806323970	Add some notes	2025-02-11 16:10:16 +01:00