Clean up and expand templates.

# Conflicts:
#	.github/workflows/release.yml

.github/release-notes/alpha.md

@@ -0,0 +1,20 @@
+Welcome to release %version of Firefly III. This **alpha** release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `alpha` tag.
+
+:warning: Please be careful with this alpha release, as it may not work as expected.
+
+Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
+
+## Changelog (not final)
+
+%changelog
+
+## Installation and upgrade instructions
+
+* 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/).
+* Alternatively, 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/)
+
+The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
+
+## Support Firefly III
+
+Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/beta.md

@@ -0,0 +1,20 @@
+Welcome to release %version of Firefly III. This **beta** release contains the latest fixes, translations and features. It may be buggy, nor work as expected. You can download the release below, and adventurous Docker users can find this release under the `beta` tag.
+
+:warning: Please be careful with this beta release, as it may not work as expected.
+
+Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
+
+## Changelog (not final)
+
+%changelog
+
+## Installation and upgrade instructions
+
+* 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/).
+* Alternatively, 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/)
+
+The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
+
+## Support Firefly III
+
+Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/branch.md

@@ -0,0 +1,20 @@
+Welcome to release %version of Firefly III. This branch-related release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `branch-*` tag.
+
+:warning: Please be careful with this branch release, as it may not work as expected.
+
+Branch releases are created to test large new features that are developed alongside the normal release flow. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
+
+## Changelog
+
+There is no changelog for this release, as it is not final. However, [changelog.md](https://github.com/firefly-iii/firefly-iii/blob/develop/changelog.md) may already contain entries for the future release that this branch will be a part of.
+
+## Installation and upgrade instructions
+
+* 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/).
+* Alternatively, 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/)
+
+The release files are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/).
+
+## Support Firefly III
+
+Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/develop.md

@@ -0,0 +1,20 @@
+Welcome to the latest development release of Firefly III. This test release contains the absolute latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `develop` tag.
+
+:warning: Please be careful with this pre-release, as it may not work as expected.
+
+This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
+
+## Changelog
+
+The changelog for this release may not be up-to-date, so it is not included. However, [changelog.md](https://github.com/firefly-iii/firefly-iii/blob/develop/changelog.md) may already contain entries for the future release.
+
+## Installation and upgrade instructions
+
+* 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/).
+* Alternatively, 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/)
+
+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/).
+
+## Support Firefly III
+
+Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/release-notes/release.md

@@ -0,0 +1,16 @@
+Welcome to release %version of Firefly III. It contains the latest fixes, translations and features. Docker users can find this release under the `latest` tag.
+
+## Changelog
+
+%changelog
+
+## Installation and upgrade instructions
+
+* 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/).
+* Alternatively, 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/)
+
+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/).
+
+## Support Firefly III
+
+Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. Please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information. Thank you for your consideration.

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v2.0.1
+      - uses: github/command@v2.0.2
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Import GPG key
@@ -233,122 +233,15 @@ jobs:
           git push
         env:
           version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
-      - name: Extract changelog
-        id: extract-changelog
+      - name: Generate release description
+        id: release-description
         uses: JC5/firefly-iii-dev@main
         with:
-          action: 'ff3:extract-changelog'
+          action: "ff3:generate-release-notes firefly-iii ${{ github.event.inputs.version }}"
           output: 'output'
         env:
           FIREFLY_III_ROOT: /github/workspace
           GH_TOKEN: ""
-      - name: Describe new release
-        run: |
-
-          # describe the development release.
-          if [[ "develop" == "$version" ]]; then
-            echo 'Describe the latest develop release'
-            rm -f output.txt
-            touch output.txt
-            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 %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
-            echo "" >> output.txt
-            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
-
-            # donations!
-            echo '' >> output.txt
-            echo '### Support Firefly III' >> output.txt
-            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
-            echo '' >> output.txt
-          fi
-          # describe a branch release
-          if [[ "$version" == branch* ]]; then
-            echo 'Describe a branch release'
-            rm -f output.txt
-            touch output.txt
-            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 %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
-            echo "" >> output.txt
-            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
-          fi
-          # describe the main release
-          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
-            echo 'Describe the latest release'
-            sudo chown -R runner:docker output.txt
-
-            # the changelog is in output.txt
-            mv output.txt output2.txt
-
-            touch output.txt
-            echo '' >> output.txt
-            echo "Welcome to release $version of Firefly III. It contains the the latest fixes, translations and features. Docker users can find this release under the \`latest\` tag." >> output.txt
-            echo '' >> output.txt
-
-            # add changelog to file.
-            cat output2.txt >> output.txt
-            echo '' >> output.txt
-            rm -f output2.txt
-
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* 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
-            echo "* 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
-
-            # donations!
-            echo '' >> output.txt
-            echo '### Support Firefly III' >> output.txt
-            echo 'Did you know you can support the development of Firefly III? You can donate in many ways, like GitHub Sponsors or Patreon. For more information, please [follow this link](https://bit.ly/donate-to-Firefly-III) for more information.' >> output.txt
-            echo '' >> output.txt
-          fi
-
-          # describe alpha release
-          if [[ "$version" == *alpha* ]]; then
-            echo 'Describe an ALPHA release'
-            rm -f output.txt
-            touch output.txt
-            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 %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
-            echo "* 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
-            echo "* 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
-
-          fi
-
-          # describe beta release
-          if [[ "$version" == *beta* ]]; then
-            echo 'Describe a BETA release'
-            rm -f output.txt
-            touch output.txt
-            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 %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
-            echo "* 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
-            echo "* 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
-
-          fi
-        env:
-          version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
       - name: Merge all into working branch
         run: |
           MERGE_INTO=develop

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -31,6 +31,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Debug\Timer;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\User;
@@ -79,17 +80,20 @@ class AccountController extends Controller
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
-        $data   = $request->getData();
-        $types  = $data['types'];
-        $query  = $data['query'];
-        $date   = $data['date'] ?? today(config('app.timezone'));
-        $return = [];
-        Timer::start(sprintf('AC accounts "%s"', $query));
-        $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
+        $data        = $request->getData();
+        $types       = $data['types'];
+        $query       = $data['query'];
+        $date        = $data['date'] ?? today(config('app.timezone'));
+        $return      = [];
+        $timer       = Timer::getInstance();
+        $timer->start(sprintf('AC accounts "%s"', $query));
+        $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->endOfDay();
 
+        $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary);
+
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;
@@ -98,15 +102,11 @@ class AccountController extends Controller
             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);
+                $balance         = $allBalances[$account->id] ?? [];
                 $key             = $this->convertToPrimary && $currency->id !== $this->primaryCurrency->id ? 'pc_balance' : 'balance';
                 $useCurrency     = $this->convertToPrimary && $currency->id !== $this->primaryCurrency->id ? $this->primaryCurrency : $currency;
                 $amount          = $balance[$key] ?? '0';
-                $nameWithBalance = sprintf(
-                    '%s (%s)',
-                    $account->name,
-                    app('amount')->formatAnything($useCurrency, $amount, false)
-                );
+                $nameWithBalance = sprintf('%s (%s)', $account->name, Amount::formatAnything($useCurrency, $amount, false));
             }
 
             $return[]        = [
@@ -138,7 +138,7 @@ class AccountController extends Controller
                 return $posA - $posB;
             }
         );
-        Timer::stop(sprintf('AC accounts "%s"', $query));
+        $timer->stop(sprintf('AC accounts "%s"', $query));
 
         return response()->api($return);
     }

app/Api/V1/Controllers/Chart/BalanceController.php

@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Chart;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Chart\ChartData;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Http\Api\AccountBalanceGrouped;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BalanceController
+ */
+class BalanceController extends Controller
+{
+    use CleansChartData;
+    use CollectsAccountsFromFilter;
+
+    private ChartData                  $chartData;
+    private GroupCollectorInterface    $collector;
+    private AccountRepositoryInterface $repository;
+
+    // private TransactionCurrency        $default;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->collector  = app(GroupCollectorInterface::class);
+                $userGroup        = $this->validateUserGroup($request);
+                $this->repository->setUserGroup($userGroup);
+                $this->collector->setUserGroup($userGroup);
+                $this->chartData  = new ChartData();
+                // $this->default    = app('amount')->getPrimaryCurrency();
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * The code is practically a duplicate of ReportController::operations.
+     *
+     * Currency is up to the account/transactions in question, but conversion to the default
+     * currency is possible.
+     *
+     * If the transaction being processed is already in native currency OR if the
+     * foreign amount is in the native currency, the amount will not be converted.
+     *
+     * @throws FireflyException
+     */
+    public function balance(ChartRequest $request): JsonResponse
+    {
+        $queryParameters = $request->getParameters();
+        $accounts        = $this->getAccountList($queryParameters);
+
+        // prepare for currency conversion and data collection:
+        /** @var TransactionCurrency $primary */
+        $primary         = Amount::getPrimaryCurrency();
+
+        // get journals for entire period:
+
+        $this->collector->setRange($queryParameters['start'], $queryParameters['end'])
+            ->withAccountInformation()
+            ->setXorAccounts($accounts)
+            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::RECONCILIATION->value, TransactionTypeEnum::TRANSFER->value])
+        ;
+        $journals        = $this->collector->getExtractedJournals();
+
+        $object          = new AccountBalanceGrouped();
+        $object->setPreferredRange($queryParameters['period']);
+        $object->setPrimary($primary);
+        $object->setAccounts($accounts);
+        $object->setJournals($journals);
+        $object->setStart($queryParameters['start']);
+        $object->setEnd($queryParameters['end']);
+        $object->groupByCurrencyAndPeriod();
+        $data            = $object->convertToChartData();
+        foreach ($data as $entry) {
+            $this->chartData->add($entry);
+        }
+
+        return response()->json($this->chartData->render());
+    }
+}

app/Api/V1/Controllers/System/CronController.php

@@ -54,6 +54,7 @@ class CronController extends Controller
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
         $return['bill_notifications']     = $this->billWarningCronJob($config['force'], $config['date']);
+        $return['webhooks']               = $this->webhookCronJob($config['force'], $config['date']);
 
         return response()->api($return);
     }

app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php

@@ -40,6 +40,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Console\Command;
@@ -72,6 +73,8 @@ class CorrectsPrimaryCurrencyAmounts extends Command
         /** @var UserGroupRepositoryInterface $repository */
         $repository = app(UserGroupRepositoryInterface::class);
 
+        Preferences::mark();
+
         /** @var UserGroup $userGroup */
         foreach ($repository->getAll() as $userGroup) {
             $this->recalculateForGroup($userGroup);
@@ -87,8 +90,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command
         $this->recalculateAccounts($userGroup);
 
         // do a check with the group's currency so we can skip some stuff.
-        Preferences::mark();
-        $currency = app('amount')->getPrimaryCurrencyByUserGroup($userGroup);
+        $currency = Amount::getPrimaryCurrencyByUserGroup($userGroup);
 
         $this->recalculatePiggyBanks($userGroup, $currency);
         $this->recalculateBudgets($userGroup, $currency);

app/Console/Commands/Tools/Cron.php

@@ -32,6 +32,7 @@ use FireflyIII\Support\Cronjobs\BillWarningCronjob;
 use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob;
 use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use FireflyIII\Support\Cronjobs\UpdateCheckCronjob;
+use FireflyIII\Support\Cronjobs\WebhookCronjob;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use InvalidArgumentException;
@@ -50,6 +51,7 @@ class Cron extends Command
         {--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.}
         {--send-bill-warnings : Send bill warnings. Other tasks will be skipped unless also requested.}
+        {--send-webhook-messages : Sends any stray webhook messages (with a maximum of 5).}
         ';
 
     public function handle(): int
@@ -58,7 +60,8 @@ class Cron extends Command
                  && !$this->option('create-recurring')
                  && !$this->option('create-auto-budgets')
                  && !$this->option('send-bill-warnings')
-                 && !$this->option('check-version');
+                 && !$this->option('check-version')
+                 && !$this->option('send-webhook-messages');
         $date  = null;
 
         try {
@@ -122,6 +125,16 @@ class Cron extends Command
                 $this->friendlyError($e->getMessage());
             }
         }
+        // Fire webhook messages cron job.
+        if ($doAll || $this->option('send-webhook-messages')) {
+            try {
+                $this->webhookCronJob($force, $date);
+            } catch (FireflyException $e) {
+                app('log')->error($e->getMessage());
+                app('log')->error($e->getTraceAsString());
+                $this->friendlyError($e->getMessage());
+            }
+        }
 
         $this->friendlyInfo('More feedback on the cron jobs can be found in the log files.');
 
@@ -239,4 +252,26 @@ class Cron extends Command
             $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
         }
     }
+
+    private function webhookCronJob(bool $force, ?Carbon $date): void
+    {
+        $webhook = new WebhookCronjob();
+        $webhook->setForce($force);
+        // set date in cron job:
+        if ($date instanceof Carbon) {
+            $webhook->setDate($date);
+        }
+
+        $webhook->fire();
+
+        if ($webhook->jobErrored) {
+            $this->friendlyError(sprintf('Error in "webhook" cron: %s', $webhook->message));
+        }
+        if ($webhook->jobFired) {
+            $this->friendlyInfo(sprintf('"Webhook" cron fired: %s', $webhook->message));
+        }
+        if ($webhook->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Webhook" cron ran with success: %s', $webhook->message));
+        }
+    }
 }

app/Events/Model/Bill/WarnUserAboutBill.php

@@ -0,0 +1,20 @@
+<?php
+
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events\Model\Bill;
+
+use FireflyIII\Events\Event;
+use FireflyIII\Models\Bill;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class WarnUserAboutBill.
+ */
+class WarnUserAboutBill extends Event
+{
+    use SerializesModels;
+
+    public function __construct(public Bill $bill, public string $field, public int $diff) {}
+}

app/Events/Model/Bill/WarnUserAboutOverdueSubscriptions.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Events\Model\Bill;
+
+use FireflyIII\Events\Event;
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+class WarnUserAboutOverdueSubscriptions extends Event
+{
+    use SerializesModels;
+
+    public function __construct(public User $user, public array $overdue) {}
+
+}

app/Events/Preferences/UserGroupChangedPrimaryCurrency.php

@@ -35,6 +35,6 @@ class UserGroupChangedPrimaryCurrency extends Event
 
     public function __construct(public UserGroup $userGroup)
     {
-        Log::debug('User group changed default currency.');
+        Log::debug('User group changed primary currency.');
     }
 }

app/Events/WarnUserAboutBill.php

@@ -1,38 +0,0 @@
-<?php
-
-/**
- * DestroyedTransactionGroup.php
- * Copyright (c) 2019 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/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Events;
-
-use FireflyIII\Models\Bill;
-use Illuminate\Queue\SerializesModels;
-
-/**
- * Class WarnUserAboutBill.
- */
-class WarnUserAboutBill extends Event
-{
-    use SerializesModels;
-
-    public function __construct(public Bill $bill, public string $field, public int $diff) {}
-}

app/Handlers/Events/BillEventHandler.php

@@ -24,48 +24,118 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Events;
 
-use FireflyIII\Events\WarnUserAboutBill;
-use FireflyIII\Notifications\User\BillReminder;
-use Illuminate\Support\Facades\Notification;
 use Exception;
+use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
+use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
+use FireflyIII\Models\Bill;
+use FireflyIII\Notifications\User\BillReminder;
+use FireflyIII\Notifications\User\SubscriptionsOverdueReminder;
+use FireflyIII\Support\Facades\Preferences;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Notification;
 
 /**
  * Class BillEventHandler
  */
 class BillEventHandler
 {
+    public function warnAboutOverdueSubscriptions(WarnUserAboutOverdueSubscriptions $event): void
+    {
+        Log::debug(sprintf('Now in %s', __METHOD__));
+        // make sure user does not get the warning twice.
+        $overdue          = $event->overdue;
+        $user             = $event->user;
+        $toBeWarned       = [];
+        Log::debug(sprintf('%d bills to warn about.', count($overdue)));
+        foreach ($overdue as $item) {
+            /** @var Bill $bill */
+            $bill         = $item['bill'];
+            $key          = sprintf('bill_overdue_%s_%s', $bill->id, substr(hash('sha256', json_encode($item['dates']['pay_dates'], JSON_THROW_ON_ERROR)), 0, 10));
+            $pref         = Preferences::getForUser($bill->user, $key, false);
+            if (true === $pref->data) {
+                Log::debug(sprintf('User #%d has already been warned about overdue subscription #%d.', $bill->user->id, $bill->id));
+
+                continue;
+            }
+            $toBeWarned[] = $item;
+        }
+        unset($bill);
+        Log::debug(sprintf('Now %d bills to warn about.', count($toBeWarned)));
+
+        /** @var bool $sendNotification */
+        $sendNotification = Preferences::getForUser($user, 'notification_bill_reminder', true)->data;
+        if (false === $sendNotification) {
+            Log::debug('User has disabled bill reminders.');
+
+            return;
+        }
+        Log::debug(sprintf('Will warn about %d overdue subscription(s).', count($toBeWarned)));
+        if (0 === count($toBeWarned)) {
+            Log::debug('No overdue subscriptions to warn about.');
+
+            return;
+        }
+        foreach ($toBeWarned as $item) {
+            /** @var Bill $bill */
+            $bill = $item['bill'];
+            $key  = sprintf('bill_overdue_%s_%s', $bill->id, substr(hash('sha256', json_encode($item['dates']['pay_dates'], JSON_THROW_ON_ERROR)), 0, 10));
+            Preferences::setForUser($bill->user, $key, true);
+        }
+        Log::warning('should hit this ONCE');
+
+        try {
+            Notification::send($user, new SubscriptionsOverdueReminder($toBeWarned));
+        } catch (Exception $e) {
+            $message = $e->getMessage();
+            if (str_contains($message, 'Bcc')) {
+                Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+
+                return;
+            }
+            if (str_contains($message, 'RFC 2822')) {
+                Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+
+                return;
+            }
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
+        }
+
+
+    }
+
     public function warnAboutBill(WarnUserAboutBill $event): void
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
 
-        $bill       = $event->bill;
+        $bill = $event->bill;
 
         /** @var bool $preference */
-        $preference = app('preferences')->getForUser($bill->user, 'notification_bill_reminder', true)->data;
+        Preferences::getForUser($bill->user, 'notification_bill_reminder', true)->data;
 
         if (true === $preference) {
-            app('log')->debug('Bill reminder is true!');
+            Log::debug('Bill reminder is true!');
 
             try {
                 Notification::send($bill->user, new BillReminder($bill, $event->field, $event->diff));
             } catch (Exception $e) {
                 $message = $e->getMessage();
                 if (str_contains($message, 'Bcc')) {
-                    app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+                    Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
 
                     return;
                 }
                 if (str_contains($message, 'RFC 2822')) {
-                    app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
+                    Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
 
                     return;
                 }
-                app('log')->error($e->getMessage());
-                app('log')->error($e->getTraceAsString());
+                Log::error($e->getMessage());
+                Log::error($e->getTraceAsString());
             }
+
+            return;
         }
-        if (false === $preference) {
-            app('log')->debug('User has disabled bill reminders.');
-        }
+        Log::debug('User has disabled bill reminders.');
     }
 }

app/Handlers/Events/PreferencesEventHandler.php

@@ -73,6 +73,7 @@ class PreferencesEventHandler
         $repository = app(PiggyBankRepositoryInterface::class);
         $repository->setUserGroup($userGroup);
         $piggyBanks = $repository->getPiggyBanks();
+        Log::debug(sprintf('Resetting %d piggy bank(s).', $piggyBanks->count()));
 
         /** @var PiggyBank $piggyBank */
         foreach ($piggyBanks as $piggyBank) {
@@ -104,6 +105,8 @@ class PreferencesEventHandler
         $repository->setUserGroup($userGroup);
         $set        = $repository->getBudgets();
 
+        Log::debug(sprintf('Resetting %d budget(s).', $set->count()));
+
         /** @var Budget $budget */
         foreach ($set as $budget) {
             foreach ($budget->autoBudgets as $autoBudget) {

app/Helpers/Report/NetWorth.php

@@ -77,8 +77,8 @@ class NetWorth implements NetWorthInterface
         Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));
         $primary          = Amount::getPrimaryCurrency();
         $netWorth         = [];
-        Log::debug(sprintf('NetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));
-        $balances         = Steam::finalAccountsBalance($accounts, $date);
+        Log::debug(sprintf('NetWorth: accountsBalancesOptimized("%s")', $date->format('Y-m-d H:i:s')));
+        $balances         = Steam::accountsBalancesOptimized($accounts, $date, null, $convertToPrimary);
 
         /** @var Account $account */
         foreach ($accounts as $account) {
@@ -143,8 +143,8 @@ class NetWorth implements NetWorthInterface
          */
         $accounts = $this->getAccounts();
         $return   = [];
-        Log::debug(sprintf('SumNetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));
-        $balances = Steam::finalAccountsBalance($accounts, $date);
+        Log::debug(sprintf('SumNetWorth: accountsBalancesOptimized("%s")', $date->format('Y-m-d H:i:s')));
+        $balances = Steam::accountsBalancesOptimized($accounts, $date);
         foreach ($accounts as $account) {
             $currency                     = $this->accountRepository->getAccountCurrency($account);
             $balance                      = $balances[$account->id]['balance'] ?? '0';

app/Http/Controllers/Account/IndexController.php

@@ -93,10 +93,10 @@ class IndexController extends Controller
         $start->subSecond();
 
         $ids           = $accounts->pluck('id')->toArray();
-        Log::debug(sprintf('inactive start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('inactive end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::finalAccountsBalance($accounts, $start);
-        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
+        Log::debug(sprintf('inactive start: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('inactive end: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
+        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
         $activities    = Steam::getLastActivities($ids);
 
 
@@ -170,10 +170,10 @@ class IndexController extends Controller
         $start->subSecond();
 
         $ids           = $accounts->pluck('id')->toArray();
-        Log::debug(sprintf('index start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('index end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::finalAccountsBalance($accounts, $start);
-        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
+        Log::debug(sprintf('index start: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('index end: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
+        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
         $activities    = Steam::getLastActivities($ids);
 
 

app/Http/Controllers/Account/ShowController.php

@@ -40,6 +40,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ShowController
@@ -81,7 +82,9 @@ class ShowController extends Controller
      *                                              */
     public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
     {
-
+        if (0 === $account->id) {
+            throw new NotFoundHttpException();
+        }
         $objectType       = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 
         if (!$this->isEditableAccount($account)) {
@@ -115,20 +118,27 @@ class ShowController extends Controller
         $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');
+        // go back max 3 years.
+        $threeYearsAgo    = clone $start;
+        $threeYearsAgo->startOfYear()->subYears(3);
+        if ($firstTransaction->lt($threeYearsAgo)) {
+            $firstTransaction = clone $threeYearsAgo;
+        }
 
+        Log::debug('Start period overview');
+        $timer            = Timer::getInstance();
+        $timer->start('period-overview');
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
 
         Log::debug('End period overview');
-        Timer::stop('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');
+        $timer->start('collection');
 
         /** @var GroupCollectorInterface $collector */
         $collector        = app(GroupCollectorInterface::class);
@@ -147,7 +157,7 @@ class ShowController extends Controller
 
 
         Log::debug('End collect transactions');
-        Timer::stop('collection');
+        $timer->stop('collection');
 
         // enrich data in arrays.
 

app/Http/Controllers/Bill/IndexController.php

@@ -57,7 +57,7 @@ class IndexController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string) trans('firefly.bills'));
+                app('view')->share('title', (string)trans('firefly.bills'));
                 app('view')->share('mainTitleIcon', 'fa-calendar-o');
                 $this->repository = app(BillRepositoryInterface::class);
 
@@ -79,7 +79,6 @@ class IndexController extends Controller
         $total       = $collection->count();
 
 
-
         $parameters  = new ParameterBag();
         // sub one day from temp start so the last paid date is one day before it should be.
         $tempStart   = clone $start;
@@ -112,7 +111,7 @@ class IndexController extends Controller
         $bills       = [
             0 => [ // the index is the order, not the ID.
                 'object_group_id'    => 0,
-                'object_group_title' => (string) trans('firefly.default_group_title_name'),
+                'object_group_title' => (string)trans('firefly.default_group_title_name'),
                 'bills'              => [],
             ],
         ];
@@ -120,7 +119,7 @@ class IndexController extends Controller
         /** @var Bill $bill */
         foreach ($collection as $bill) {
             $array                            = $transformer->transform($bill);
-            $groupOrder                       = (int) $array['object_group_order'];
+            $groupOrder                       = (int)$array['object_group_order'];
             // make group array if necessary:
             $bills[$groupOrder] ??= [
                 'object_group_id'    => $array['object_group_id'],
@@ -173,16 +172,28 @@ class IndexController extends Controller
                     'currency_symbol'         => $bill['currency_symbol'],
                     'currency_decimal_places' => $bill['currency_decimal_places'],
                     'avg'                     => '0',
+                    'total_left_to_pay'       => '0',
                     'period'                  => $range,
                     'per_period'              => '0',
                 ];
 
                 // only fill in avg when bill is active.
                 if (null !== $bill['next_expected_match']) {
-                    $avg                                   = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
-                    $avg                                   = bcmul($avg, (string) count($bill['pay_dates']));
+                    $avg                                   = bcdiv(bcadd((string)$bill['amount_min'], (string)$bill['amount_max']), '2');
+                    $avg                                   = bcmul($avg, (string)count($bill['pay_dates']));
                     $sums[$groupOrder][$currencyId]['avg'] = bcadd($sums[$groupOrder][$currencyId]['avg'], $avg);
                 }
+                // only fill in total_left_to_pay when bill is not yet paid.
+                if (count($bill['paid_dates']) < count($bill['pay_dates'])) {
+                    $count = count($bill['pay_dates']) - count($bill['paid_dates']);
+                    if ($count > 0) {
+                        $avg                                                 = bcdiv(bcadd((string)$bill['amount_min'], (string)$bill['amount_max']), '2');
+                        $avg                                                 = bcmul($avg, (string)$count);
+                        $sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);
+                    }
+                }
+
+
                 // fill in per period regardless:
                 $sums[$groupOrder][$currencyId]['per_period'] = bcadd($sums[$groupOrder][$currencyId]['per_period'], $this->amountPerPeriod($bill, $range));
             }
@@ -193,7 +204,7 @@ class IndexController extends Controller
 
     private function amountPerPeriod(array $bill, string $range): string
     {
-        $avg        = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
+        $avg        = bcdiv(bcadd((string)$bill['amount_min'], (string)$bill['amount_max']), '2');
 
         app('log')->debug(sprintf('Amount per period for bill #%d "%s"', $bill['id'], $bill['name']));
         app('log')->debug(sprintf('Average is %s', $avg));
@@ -206,8 +217,8 @@ class IndexController extends Controller
             'weekly'    => '52.17',
             'daily'     => '365.24',
         ];
-        $yearAmount = bcmul($avg, bcdiv($multiplies[$bill['repeat_freq']], (string) ($bill['skip'] + 1)));
-        app('log')->debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], (string) ($bill['skip'] + 1)));
+        $yearAmount = bcmul($avg, bcdiv($multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));
+        app('log')->debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));
 
         // per period:
         $division   = [
@@ -258,8 +269,8 @@ class IndexController extends Controller
                     'period'                  => $entry['period'],
                     'per_period'              => '0',
                 ];
-                $totals[$currencyId]['avg']        = bcadd($totals[$currencyId]['avg'], (string) $entry['avg']);
-                $totals[$currencyId]['per_period'] = bcadd($totals[$currencyId]['per_period'], (string) $entry['per_period']);
+                $totals[$currencyId]['avg']        = bcadd($totals[$currencyId]['avg'], (string)$entry['avg']);
+                $totals[$currencyId]['per_period'] = bcadd($totals[$currencyId]['per_period'], (string)$entry['per_period']);
             }
         }
 
@@ -271,8 +282,8 @@ class IndexController extends Controller
      */
     public function setOrder(Request $request, Bill $bill): JsonResponse
     {
-        $objectGroupTitle = (string) $request->get('objectGroupTitle');
-        $newOrder         = (int) $request->get('order');
+        $objectGroupTitle = (string)$request->get('objectGroupTitle');
+        $newOrder         = (int)$request->get('order');
         $this->repository->setOrder($bill, $newOrder);
         if ('' !== $objectGroupTitle) {
             $this->repository->setObjectGroup($bill, $objectGroupTitle);

app/Http/Controllers/Chart/AccountController.php

@@ -35,6 +35,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\AugumentData;
 use FireflyIII\Support\Http\Controllers\ChartGeneration;
@@ -78,6 +79,7 @@ class AccountController extends Controller
 
     /**
      * Shows the balances for all the user's expense accounts (on the front page).
+     * 2025-08-06 validated for multi (primary) currency
      *
      * This chart is (multi) currency aware.
      */
@@ -112,11 +114,11 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::finalAccountsBalance($accounts, $start);
-        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
-
+        Log::debug(sprintf('expenseAccounts: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('expenseAccounts: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
+        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
+        Log::debug('Done collecting balances');
         // loop the accounts, then check for balance and currency info.
         foreach ($accounts as $account) {
             // Log::debug(sprintf('[a] Now in account #%d ("%s")', $account->id, $account->name));
@@ -157,7 +159,7 @@ class AccountController extends Controller
                     $tempData[] = [
                         'name'        => $accountNames[$account->id],
                         'difference'  => $diff,
-                        'diff_float'  => (float) $diff, // intentional float
+                        'diff_float'  => (float)$diff, // intentional float
                         'currency_id' => $currencies[$searchCode]->id,
                     ];
                 }
@@ -182,7 +184,7 @@ class AccountController extends Controller
         foreach ($currencies as $currencyId => $currency) {
             $dataSet
                                     = [
-                                        'label'           => (string) trans('firefly.spent'),
+                                        'label'           => (string)trans('firefly.spent'),
                                         'type'            => 'bar',
                                         'currency_symbol' => $currency->symbol,
                                         'currency_code'   => $currency->code,
@@ -195,7 +197,7 @@ class AccountController extends Controller
         foreach ($tempData as $entry) {
             $currencyId                               = $entry['currency_id'];
             $name                                     = $entry['name'];
-            $chartData[$currencyId]['entries'][$name] = (float) $entry['difference'];
+            $chartData[$currencyId]['entries'][$name] = (float)$entry['difference'];
         }
 
         $data          = $this->generator->multiSet($chartData);
@@ -223,6 +225,7 @@ class AccountController extends Controller
         $cache     = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($start);
+        $cache->addProperty($this->convertToPrimary);
         $cache->addProperty($end);
         $cache->addProperty('chart.account.expense-budget');
         if ($cache->has()) {
@@ -231,7 +234,10 @@ class AccountController extends Controller
 
         /** @var GroupCollectorInterface $collector */
         $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
+        $collector->setAccounts(new Collection([$account]))
+            ->setRange($start, $end)
+            ->withBudgetInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
+        ;
         $journals  = $collector->getExtractedJournals();
         $chartData = [];
         $result    = [];
@@ -239,19 +245,37 @@ class AccountController extends Controller
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $budgetId              = (int) $journal['budget_id'];
+            $budgetId              = (int)$journal['budget_id'];
             $key                   = sprintf('%d-%d', $budgetId, $journal['currency_id']);
             $budgetIds[]           = $budgetId;
+
+            // currency info:
+            $currencyId            = (int)$journal['currency_id'];
+            $currencyName          = $journal['currency_name'];
+            $currencySymbol        = $journal['currency_symbol'];
+            $currencyCode          = $journal['currency_code'];
+            $currencyDecimalPlaces = $journal['currency_decimal_places'];
+            $field                 = 'amount';
+            if ($this->convertToPrimary && $this->primaryCurrency->id !== $currencyId) {
+                $field                 = 'pc_amount';
+                $currencyName          = $this->primaryCurrency->name;
+                $currencySymbol        = $this->primaryCurrency->symbol;
+                $currencyCode          = $this->primaryCurrency->code;
+                $currencyDecimalPlaces = $this->primaryCurrency->decimal_places;
+
+            }
+
             if (!array_key_exists($key, $result)) {
                 $result[$key] = [
-                    'total'           => '0',
-                    'budget_id'       => $budgetId,
-                    'currency_name'   => $journal['currency_name'],
-                    'currency_symbol' => $journal['currency_symbol'],
-                    'currency_code'   => $journal['currency_code'],
+                    'total'                   => '0',
+                    'budget_id'               => $budgetId,
+                    'currency_name'           => $currencyName,
+                    'currency_symbol'         => $currencySymbol,
+                    'currency_code'           => $currencyCode,
+                    'currency_decimal_places' => $currencyDecimalPlaces,
                 ];
             }
-            $result[$key]['total'] = bcadd((string) $journal['amount'], $result[$key]['total']);
+            $result[$key]['total'] = bcadd((string)$journal[$field], $result[$key]['total']);
         }
 
         $names     = $this->getBudgetNames($budgetIds);
@@ -259,7 +283,7 @@ class AccountController extends Controller
         foreach ($result as $row) {
             $budgetId          = $row['budget_id'];
             $name              = $names[$budgetId];
-            $label             = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
+            $label             = (string)trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
 
@@ -289,6 +313,7 @@ class AccountController extends Controller
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToPrimary);
         $cache->addProperty('chart.account.expense-category');
         if ($cache->has()) {
             return response()->json($cache->get());
@@ -305,22 +330,39 @@ class AccountController extends Controller
         foreach ($journals as $journal) {
             $key                   = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
             if (!array_key_exists($key, $result)) {
-                $result[$key] = [
-                    'total'           => '0',
-                    'category_id'     => (int) $journal['category_id'],
-                    'currency_name'   => $journal['currency_name'],
-                    'currency_symbol' => $journal['currency_symbol'],
-                    'currency_code'   => $journal['currency_code'],
+
+                // currency info:
+                $currencyId            = (int)$journal['currency_id'];
+                $currencyName          = $journal['currency_name'];
+                $currencySymbol        = $journal['currency_symbol'];
+                $currencyCode          = $journal['currency_code'];
+                $currencyDecimalPlaces = $journal['currency_decimal_places'];
+                $field                 = 'amount';
+                if ($this->convertToPrimary && $this->primaryCurrency->id !== $currencyId) {
+                    $field                 = 'pc_amount';
+                    $currencyName          = $this->primaryCurrency->name;
+                    $currencySymbol        = $this->primaryCurrency->symbol;
+                    $currencyCode          = $this->primaryCurrency->code;
+                    $currencyDecimalPlaces = $this->primaryCurrency->decimal_places;
+                }
+
+                $result[$key]          = [
+                    'total'                   => '0',
+                    'category_id'             => (int)$journal['category_id'],
+                    'currency_name'           => $currencyName,
+                    'currency_code'           => $currencyCode,
+                    'currency_symbol'         => $currencySymbol,
+                    'currency_decimal_places' => $currencyDecimalPlaces,
                 ];
             }
-            $result[$key]['total'] = bcadd((string) $journal['amount'], $result[$key]['total']);
+            $result[$key]['total'] = bcadd((string)$journal[$field], $result[$key]['total']);
         }
         $names     = $this->getCategoryNames(array_keys($result));
 
         foreach ($result as $row) {
             $categoryId        = $row['category_id'];
             $name              = $names[$categoryId] ?? '(unknown)';
-            $label             = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
+            $label             = (string)trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
 
@@ -341,11 +383,11 @@ class AccountController extends Controller
         $end            = clone session('end', today(config('app.timezone'))->endOfMonth());
         $defaultSet     = $repository->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
         // Log::debug('Default set is ', $defaultSet);
-        $frontpage      = app('preferences')->get('frontpageAccounts', $defaultSet);
+        $frontpage      = Preferences::get('frontpageAccounts', $defaultSet);
         $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data;
         Log::debug('Frontpage preference set is ', $frontpageArray);
         if (0 === count($frontpageArray)) {
-            app('preferences')->set('frontpageAccounts', $defaultSet);
+            Preferences::set('frontpageAccounts', $defaultSet);
             Log::debug('frontpage set is empty!');
         }
         $accounts       = $repository->getAccountsById($frontpageArray);
@@ -375,6 +417,7 @@ class AccountController extends Controller
         $cache     = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($start);
+        $cache->addProperty($this->convertToPrimary);
         $cache->addProperty($end);
         $cache->addProperty('chart.account.income-category');
         if ($cache->has()) {
@@ -394,22 +437,39 @@ class AccountController extends Controller
         foreach ($journals as $journal) {
             $key                   = sprintf('%d-%d', $journal['category_id'], $journal['currency_id']);
             if (!array_key_exists($key, $result)) {
-                $result[$key] = [
-                    'total'           => '0',
-                    'category_id'     => $journal['category_id'],
-                    'currency_name'   => $journal['currency_name'],
-                    'currency_symbol' => $journal['currency_symbol'],
-                    'currency_code'   => $journal['currency_code'],
+
+                // currency info:
+                $currencyId            = (int)$journal['currency_id'];
+                $currencyName          = $journal['currency_name'];
+                $currencySymbol        = $journal['currency_symbol'];
+                $currencyCode          = $journal['currency_code'];
+                $currencyDecimalPlaces = $journal['currency_decimal_places'];
+                $field                 = 'amount';
+                if ($this->convertToPrimary && $this->primaryCurrency->id !== $currencyId) {
+                    $field                 = 'pc_amount';
+                    $currencyName          = $this->primaryCurrency->name;
+                    $currencySymbol        = $this->primaryCurrency->symbol;
+                    $currencyCode          = $this->primaryCurrency->code;
+                    $currencyDecimalPlaces = $this->primaryCurrency->decimal_places;
+                }
+
+                $result[$key]          = [
+                    'total'                   => '0',
+                    'category_id'             => $journal['category_id'],
+                    'currency_name'           => $currencyName,
+                    'currency_code'           => $currencyCode,
+                    'currency_symbol'         => $currencySymbol,
+                    'currency_decimal_places' => $currencyDecimalPlaces,
                 ];
             }
-            $result[$key]['total'] = bcadd((string) $journal['amount'], $result[$key]['total']);
+            $result[$key]['total'] = bcadd((string)$journal[$field], $result[$key]['total']);
         }
 
         $names     = $this->getCategoryNames(array_keys($result));
         foreach ($result as $row) {
             $categoryId        = $row['category_id'];
             $name              = $names[$categoryId] ?? '(unknown)';
-            $label             = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
+            $label             = (string)trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]);
             $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']];
         }
         $data      = $this->generator->multiCurrencyPieChart($chartData);
@@ -450,7 +510,7 @@ class AccountController extends Controller
         // This period depends on the size of the chart
         $current         = clone $start;
         $current         = app('navigation')->endOfX($current, $step, null);
-        $format          = (string) trans('config.month_and_day_js', [], $locale);
+        $format          = (string)trans('config.month_and_day_js', [], $locale);
         $accountCurrency = $this->accountRepository->getAccountCurrency($account);
 
         $range           = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToPrimary);
@@ -512,7 +572,7 @@ class AccountController extends Controller
         foreach ($return as $key => $info) {
             if ('balance' !== $key && 'pc_balance' !== $key) {
                 // assume it's a currency:
-                $setCurrency             = $this->currencyRepository->findByCode((string) $key);
+                $setCurrency             = $this->currencyRepository->findByCode((string)$key);
                 $info['currency_symbol'] = $setCurrency->symbol;
                 $info['currency_code']   = $setCurrency->code;
                 $info['label']           = sprintf('%s (%s)', $account->name, $setCurrency->symbol);
@@ -525,7 +585,7 @@ class AccountController extends Controller
             if ('pc_balance' === $key) {
                 $info['currency_symbol'] = $this->primaryCurrency->symbol;
                 $info['currency_code']   = $this->primaryCurrency->code;
-                $info['label']           = sprintf('%s (%s) (%s)', $account->name, (string) trans('firefly.sum'), $this->primaryCurrency->symbol);
+                $info['label']           = sprintf('%s (%s) (%s)', $account->name, (string)trans('firefly.sum'), $this->primaryCurrency->symbol);
             }
             $chartData[] = $info;
         }
@@ -594,10 +654,10 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
-        $startBalances = Steam::finalAccountsBalance($accounts, $start);
-        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
+        Log::debug(sprintf('revAccounts: accountsBalancesOptimized("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('revAccounts: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::accountsBalancesOptimized($accounts, $start, $this->primaryCurrency, $this->convertToPrimary);
+        $endBalances   = Steam::accountsBalancesOptimized($accounts, $end, $this->primaryCurrency, $this->convertToPrimary);
 
 
         // loop the accounts, then check for balance and currency info.
@@ -640,7 +700,7 @@ class AccountController extends Controller
                     $tempData[] = [
                         'name'        => $accountNames[$account->id],
                         'difference'  => $diff,
-                        'diff_float'  => (float) $diff, // intentional float
+                        'diff_float'  => (float)$diff, // intentional float
                         'currency_id' => $currencies[$searchCode]->id,
                     ];
                 }
@@ -667,7 +727,7 @@ class AccountController extends Controller
         foreach ($currencies as $currencyId => $currency) {
             $dataSet
                                     = [
-                                        'label'           => (string) trans('firefly.earned'),
+                                        'label'           => (string)trans('firefly.earned'),
                                         'type'            => 'bar',
                                         'currency_symbol' => $currency->symbol,
                                         'currency_code'   => $currency->code,

app/Http/Controllers/Controller.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Events\RequestedSendWebhookMessages;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
@@ -33,6 +34,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Route;
 
@@ -141,6 +143,14 @@ abstract class Controller extends BaseController
                     View::share('shownDemo', $shownDemo);
                     View::share('current_route_name', $page);
                     View::share('original_route_name', Route::currentRouteName());
+
+                    // lottery to send any remaining webhooks:
+                    if (7 === random_int(1, 10)) {
+                        // trigger event to send them:
+                        Log::debug('send event RequestedSendWebhookMessages through lottery');
+                        event(new RequestedSendWebhookMessages());
+                    }
+
                 }
                 View::share('darkMode', $darkMode);
 

app/Http/Controllers/PreferencesController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
+use FireflyIII\Support\Singleton\PreferencesSingleton;
 use JsonException;
 use Carbon\Carbon;
 use FireflyIII\Enums\AccountTypeEnum;
@@ -269,7 +270,9 @@ class PreferencesController extends Controller
         if ($convertToPrimary && !$this->convertToPrimary) {
             // set to true!
             Log::debug('User sets convertToPrimary to true.');
-            Preferences::set('convert_to_primary', $convertToPrimary);
+            Preferences::set('convert_to_primary', true);
+            $singleton = PreferencesSingleton::getInstance();
+            $singleton->resetPreferences();
             event(new UserGroupChangedPrimaryCurrency(auth()->user()->userGroup));
         }
         Preferences::set('convert_to_primary', $convertToPrimary);

app/Http/Controllers/ReportController.php

@@ -188,16 +188,7 @@ class ReportController extends Controller
         $start->endOfDay(); // end of day so the final balance is at the end of that day.
         $end->endOfDay();
 
-        app('view')->share(
-            'subTitle',
-            trans(
-                'firefly.report_default',
-                [
-                    'start' => $start->isoFormat($this->monthAndDayFormat),
-                    'end'   => $end->isoFormat($this->monthAndDayFormat),
-                ]
-            )
-        );
+        app('view')->share('subTitle', trans('firefly.report_default', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end'   => $end->isoFormat($this->monthAndDayFormat)]));
 
         $generator = ReportGeneratorFactory::reportGenerator('Standard', $start, $end);
         $generator->setAccounts($accounts);
@@ -222,16 +213,7 @@ class ReportController extends Controller
         $start->endOfDay(); // end of day so the final balance is at the end of that day.
         $end->endOfDay();
 
-        app('view')->share(
-            'subTitle',
-            trans(
-                'firefly.report_double',
-                [
-                    'start' => $start->isoFormat($this->monthAndDayFormat),
-                    'end'   => $end->isoFormat($this->monthAndDayFormat),
-                ]
-            )
-        );
+        app('view')->share('subTitle', trans('firefly.report_double', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end'   => $end->isoFormat($this->monthAndDayFormat)]));
 
         $generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
         $generator->setAccounts($accounts);

app/Http/Controllers/Transaction/ShowController.php

@@ -25,16 +25,20 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Transaction;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\AuditLogEntry\ALERepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
 use Illuminate\View\View;
 use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ShowController
@@ -57,7 +61,7 @@ class ShowController extends Controller
                 $this->repository    = app(TransactionGroupRepositoryInterface::class);
                 $this->aleRepository = app(ALERepositoryInterface::class);
 
-                app('view')->share('title', (string) trans('firefly.transactions'));
+                app('view')->share('title', (string)trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 return $next($request);
@@ -80,38 +84,62 @@ class ShowController extends Controller
      */
     public function show(TransactionGroup $transactionGroup)
     {
+        /** @var User $admin */
+        $admin           = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setUser($admin)->setTransactionGroup($transactionGroup)->withAPIInformation();
+
+        $selectedGroup   = $collector->getGroups()->first();
+        if (null === $selectedGroup) {
+            throw new NotFoundHttpException();
+        }
+
+        // enrich
+        $enrichment      = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $selectedGroup   = $enrichment->enrichSingle($selectedGroup);
+
+
         /** @var null|TransactionJournal $first */
         $first           = $transactionGroup->transactionJournals()->first(['transaction_journals.*']);
         $splits          = $transactionGroup->transactionJournals()->count();
+        $splits          = count($selectedGroup['transactions']);
+        $keys            = array_keys($selectedGroup['transactions']);
+        $first           = $selectedGroup['transactions'][array_shift($keys)];
+        unset($keys);
 
         if (null === $first) {
             throw new FireflyException('This transaction is broken :(.');
         }
-
-        $type            = (string) trans(sprintf('firefly.%s', $first->transactionType->type));
-        $title           = 1 === $splits ? $first->description : $transactionGroup->title;
+        $type            = (string)trans(sprintf('firefly.%s', $first['transaction_type_type']));
+        $title           = 1 === $splits ? $first['description'] : $selectedGroup['title'];
         $subTitle        = sprintf('%s: "%s"', $type, $title);
 
+        // enrich
+        $enrichment      = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $selectedGroup   = $enrichment->enrichSingle($selectedGroup);
+
         /** @var TransactionGroupTransformer $transformer */
         $transformer     = app(TransactionGroupTransformer::class);
         $transformer->setParameters(new ParameterBag());
         $groupArray      = $transformer->transformObject($transactionGroup);
 
         // do some calculations:
-        $amounts         = $this->getAmounts($groupArray);
-        $accounts        = $this->getAccounts($groupArray);
+        $amounts         = $this->getAmounts($selectedGroup);
+        $accounts        = $this->getAccounts($selectedGroup);
 
-        foreach (array_keys($groupArray['transactions']) as $index) {
-            $groupArray['transactions'][$index]['tags'] = $this->repository->getTagObjects(
-                (int) $groupArray['transactions'][$index]['transaction_journal_id']
-            );
+        foreach (array_keys($selectedGroup['transactions']) as $index) {
+            $selectedGroup['transactions'][$index]['tags'] = $this->repository->getTagObjects((int)$selectedGroup['transactions'][$index]['transaction_journal_id']);
         }
-
         // get audit log entries:
         $groupLogEntries = $this->aleRepository->getForObject($transactionGroup);
         $logEntries      = [];
-        foreach ($transactionGroup->transactionJournals as $journal) {
-            $logEntries[$journal->id] = $this->aleRepository->getForObject($journal);
+        foreach ($selectedGroup['transactions'] as $journal) {
+            $logEntries[$journal['transaction_journal_id']] = $this->aleRepository->getForId(TransactionJournal::class, $journal['transaction_journal_id']);
         }
 
         $events          = $this->repository->getPiggyEvents($transactionGroup);
@@ -129,6 +157,7 @@ class ShowController extends Controller
                 'groupLogEntries',
                 'subTitle',
                 'splits',
+                'selectedGroup',
                 'groupArray',
                 'events',
                 'attachments',
@@ -142,34 +171,38 @@ class ShowController extends Controller
     {
         $amounts = [];
         foreach ($group['transactions'] as $transaction) {
+            // add normal amount:
             $symbol                     = $transaction['currency_symbol'];
-            if (!array_key_exists($symbol, $amounts)) {
-                $amounts[$symbol] = [
-                    'amount'         => '0',
-                    'symbol'         => $symbol,
-                    'decimal_places' => $transaction['currency_decimal_places'],
-                ];
-            }
-            $amounts[$symbol]['amount'] = bcadd($amounts[$symbol]['amount'], (string) $transaction['amount']);
-            if (null !== $transaction['foreign_amount'] && '' !== $transaction['foreign_amount']
-                && 0 !== bccomp(
-                    '0',
-                    (string) $transaction['foreign_amount']
-                )) {
+            $amounts[$symbol] ??= [
+                'amount'         => '0',
+                'symbol'         => $symbol,
+                'decimal_places' => $transaction['currency_decimal_places'],
+            ];
+            $amounts[$symbol]['amount'] = bcadd($amounts[$symbol]['amount'], (string)$transaction['amount']);
+
+            // add foreign amount:
+            if (null !== $transaction['foreign_amount'] && '' !== $transaction['foreign_amount'] && 0 !== bccomp('0', (string)$transaction['foreign_amount'])) {
                 // same for foreign currency:
                 $foreignSymbol                     = $transaction['foreign_currency_symbol'];
-                if (!array_key_exists($foreignSymbol, $amounts)) {
-                    $amounts[$foreignSymbol] = [
-                        'amount'         => '0',
-                        'symbol'         => $foreignSymbol,
-                        'decimal_places' => $transaction['foreign_currency_decimal_places'],
-                    ];
-                }
-                $amounts[$foreignSymbol]['amount'] = bcadd(
-                    $amounts[$foreignSymbol]['amount'],
-                    (string) $transaction['foreign_amount']
-                );
+                $amounts[$foreignSymbol] ??= [
+                    'amount'         => '0',
+                    'symbol'         => $foreignSymbol,
+                    'decimal_places' => $transaction['foreign_currency_decimal_places'],
+                ];
+                $amounts[$foreignSymbol]['amount'] = bcadd($amounts[$foreignSymbol]['amount'], (string)$transaction['foreign_amount']);
             }
+            // add primary currency amount
+            if (null !== $transaction['pc_amount'] && $transaction['currency_id'] !== $this->primaryCurrency->id) {
+                // same for foreign currency:
+                $primarySymbol                     = $this->primaryCurrency->symbol;
+                $amounts[$primarySymbol] ??= [
+                    'amount'         => '0',
+                    'symbol'         => $this->primaryCurrency->symbol,
+                    'decimal_places' => $this->primaryCurrency->decimal_places,
+                ];
+                $amounts[$primarySymbol]['amount'] = bcadd($amounts[$primarySymbol]['amount'], (string)$transaction['pc_amount']);
+            }
+
         }
 
         return $amounts;
@@ -184,16 +217,16 @@ class ShowController extends Controller
 
         foreach ($group['transactions'] as $transaction) {
             $accounts['source'][]      = [
-                'type' => $transaction['source_type'],
-                'id'   => $transaction['source_id'],
-                'name' => $transaction['source_name'],
-                'iban' => $transaction['source_iban'],
+                'type' => $transaction['source_account_type'],
+                'id'   => $transaction['source_account_id'],
+                'name' => $transaction['source_account_name'],
+                'iban' => $transaction['source_account_iban'],
             ];
             $accounts['destination'][] = [
-                'type' => $transaction['destination_type'],
-                'id'   => $transaction['destination_id'],
-                'name' => $transaction['destination_name'],
-                'iban' => $transaction['destination_iban'],
+                'type' => $transaction['destination_account_type'],
+                'id'   => $transaction['destination_account_id'],
+                'name' => $transaction['destination_account_name'],
+                'iban' => $transaction['destination_account_iban'],
             ];
         }
 

app/Jobs/WarnAboutBills.php

@@ -25,13 +25,18 @@ declare(strict_types=1);
 namespace FireflyIII\Jobs;
 
 use Carbon\Carbon;
-use FireflyIII\Events\WarnUserAboutBill;
+use FireflyIII\Events\Model\Bill\WarnUserAboutBill;
+use FireflyIII\Events\Model\Bill\WarnUserAboutOverdueSubscriptions;
 use FireflyIII\Models\Bill;
+use FireflyIII\Support\Facades\Navigation;
+use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;
+use FireflyIII\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class WarnAboutBills
@@ -63,7 +68,7 @@ class WarnAboutBills implements ShouldQueue
 
         $this->force = false;
 
-        app('log')->debug(sprintf('Created new WarnAboutBills("%s")', $this->date->format('Y-m-d')));
+        Log::debug(sprintf('Created new WarnAboutBills("%s")', $this->date->format('Y-m-d')));
     }
 
     /**
@@ -71,36 +76,42 @@ class WarnAboutBills implements ShouldQueue
      */
     public function handle(): void
     {
-        app('log')->debug(sprintf('Now at start of WarnAboutBills() job for %s.', $this->date->format('D d M Y')));
-        $bills = Bill::all();
+        Log::debug(sprintf('Now at start of WarnAboutBills() job for %s.', $this->date->format('D d M Y')));
+        foreach (User::all() as $user) {
+            $bills   = $user->bills()->where('active', true)->get();
+            $overdue = [];
 
-        /** @var Bill $bill */
-        foreach ($bills as $bill) {
-            app('log')->debug(sprintf('Now checking bill #%d ("%s")', $bill->id, $bill->name));
-            if ($this->hasDateFields($bill)) {
-                if ($this->needsWarning($bill, 'end_date')) {
-                    $this->sendWarning($bill, 'end_date');
+            /** @var Bill $bill */
+            foreach ($bills as $bill) {
+                Log::debug(sprintf('Now checking bill #%d ("%s")', $bill->id, $bill->name));
+                $dates = $this->getDates($bill);
+                if ($this->needsOverdueAlert($dates)) {
+                    $overdue[] = ['bill' => $bill, 'dates' => $dates];
                 }
-                if ($this->needsWarning($bill, 'extension_date')) {
-                    $this->sendWarning($bill, 'extension_date');
+                if ($this->hasDateFields($bill)) {
+                    if ($this->needsWarning($bill, 'end_date')) {
+                        $this->sendWarning($bill, 'end_date');
+                    }
+                    if ($this->needsWarning($bill, 'extension_date')) {
+                        $this->sendWarning($bill, 'extension_date');
+                    }
                 }
             }
+            $this->sendOverdueAlerts($user, $overdue);
         }
-        app('log')->debug('Done with handle()');
+        Log::debug('Done with handle()');
 
-        // clear cache:
-        app('preferences')->mark();
     }
 
     private function hasDateFields(Bill $bill): bool
     {
         if (false === $bill->active) {
-            app('log')->debug('Bill is not active.');
+            Log::debug('Bill is not active.');
 
             return false;
         }
         if (null === $bill->end_date && null === $bill->extension_date) {
-            app('log')->debug('Bill has no date fields.');
+            Log::debug('Bill has no date fields.');
 
             return false;
         }
@@ -115,7 +126,7 @@ class WarnAboutBills implements ShouldQueue
         }
         $diff = $this->getDiff($bill, $field);
         $list = config('firefly.bill_reminder_periods');
-        app('log')->debug(sprintf('Difference in days for field "%s" ("%s") is %d day(s)', $field, $bill->{$field}->format('Y-m-d'), $diff));
+        Log::debug(sprintf('Difference in days for field "%s" ("%s") is %d day(s)', $field, $bill->{$field}->format('Y-m-d'), $diff));
         if (in_array($diff, $list, true)) {
             return true;
         }
@@ -128,13 +139,13 @@ class WarnAboutBills implements ShouldQueue
         $today  = clone $this->date;
         $carbon = clone $bill->{$field};
 
-        return (int) $today->diffInDays($carbon);
+        return (int)$today->diffInDays($carbon);
     }
 
     private function sendWarning(Bill $bill, string $field): void
     {
         $diff = $this->getDiff($bill, $field);
-        app('log')->debug('Will now send warning!');
+        Log::debug('Will now send warning!');
         event(new WarnUserAboutBill($bill, $field, $diff));
     }
 
@@ -149,4 +160,49 @@ class WarnAboutBills implements ShouldQueue
     {
         $this->force = $force;
     }
+
+    private function getDates(Bill $bill): array
+    {
+        $start      = clone $this->date;
+        $start      = Navigation::startOfPeriod($start, $bill->repeat_freq);
+        $end        = clone $start;
+        $end        = Navigation::endOfPeriod($end, $bill->repeat_freq);
+        $enrichment = new SubscriptionEnrichment();
+        $enrichment->setUser($bill->user);
+        $enrichment->setStart($start);
+        $enrichment->setEnd($end);
+        $single     = $enrichment->enrichSingle($bill);
+
+        return [
+            'pay_dates'  => $single->meta['pay_dates'] ?? [],
+            'paid_dates' => $single->meta['paid_dates'] ?? [],
+        ];
+    }
+
+    private function needsOverdueAlert(array $dates): bool
+    {
+        $count    = count($dates['pay_dates']) - count($dates['paid_dates']);
+        if (0 === $count || 0 === count($dates['pay_dates'])) {
+            return false;
+        }
+        // the earliest date in the list of pay dates must be 48hrs or more ago.
+        $earliest = new Carbon($dates['pay_dates'][0]);
+        $earliest->startOfDay();
+        Log::debug(sprintf('Earliest expected pay date is %s', $earliest->toAtomString()));
+        $diff     = $earliest->diffInDays($this->date);
+        Log::debug(sprintf('Difference in days is %s', $diff));
+        if ($diff < 2) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function sendOverdueAlerts(User $user, array $overdue): void
+    {
+        if (count($overdue) > 0) {
+            Log::debug(sprintf('Will now send warning about overdue bill for user #%d.', $user->id));
+            event(new WarnUserAboutOverdueSubscriptions($user, $overdue));
+        }
+    }
 }

app/Notifications/User/SubscriptionsOverdueReminder.php

@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Notifications\User;
+
+use Carbon\Carbon;
+use FireflyIII\Notifications\ReturnsAvailableChannels;
+use FireflyIII\Notifications\ReturnsSettings;
+use FireflyIII\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
+use NotificationChannels\Pushover\PushoverMessage;
+
+class SubscriptionsOverdueReminder extends Notification
+{
+    use Queueable;
+
+    public function __construct(private array $overdue) {}
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function toArray(User $notifiable): array
+    {
+        return [
+        ];
+    }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function toMail(User $notifiable): MailMessage
+    {
+        // format the data
+        $info  = [];
+        $count = 0;
+        foreach ($this->overdue as $item) {
+            $current              = [
+                'bill' => $item['bill'],
+            ];
+            $current['pay_dates'] = array_map(
+                static function (string $date): string {
+                    return new Carbon($date)->isoFormat((string)trans('config.month_and_day_moment_js'));
+                },
+                $item['dates']['pay_dates']
+            );
+            $info[]               = $current;
+            ++$count;
+        }
+
+        return new MailMessage()
+            ->markdown('emails.subscriptions-overdue-warning', ['info' => $info, 'count' => $count])
+            ->subject($this->getSubject())
+        ;
+    }
+
+    private function getSubject(): string
+    {
+        if (count($this->overdue) > 1) {
+            return (string)trans('email.subscriptions_overdue_subject_multi', ['count' => count($this->overdue)]);
+        }
+
+        return (string)trans('email.subscriptions_overdue_subject_single');
+    }
+
+    public function toNtfy(User $notifiable): Message
+    {
+        $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
+        $message  = new Message();
+        $message->topic($settings['ntfy_topic']);
+        $message->title($this->getSubject());
+        $message->body((string)trans('email.bill_warning_please_action'));
+
+        return $message;
+    }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function toPushover(User $notifiable): PushoverMessage
+    {
+        return PushoverMessage::create((string)trans('email.bill_warning_please_action'))
+            ->title($this->getSubject())
+        ;
+    }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function toSlack(User $notifiable): SlackMessage
+    {
+        $url = route('bills.index');
+
+        return new SlackMessage()
+            ->warning()
+            ->attachment(static function ($attachment) use ($url): void {
+                $attachment->title((string)trans('firefly.visit_bills'), $url);
+            })
+            ->content($this->getSubject())
+        ;
+    }
+
+    /**
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function via(User $notifiable): array
+    {
+        return ReturnsAvailableChannels::returnChannels('user', $notifiable);
+    }
+}

app/Providers/EventServiceProvider.php

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

app/Repositories/Account/AccountRepository.php

@@ -562,7 +562,13 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac
                 'foreign_currencies.decimal_places as foreign_currency_decimal_places',
 
                 // fields
-                'transaction_journals.date', 'transaction_types.type', 'transaction_journals.transaction_currency_id', 'transactions.amount'])
+                'transaction_journals.date',
+                'transaction_types.type',
+                'transaction_journals.transaction_currency_id',
+                'transactions.amount',
+                'transactions.native_amount as pc_amount',
+                'transactions.foreign_amount',
+            ])
             ->toArray()
         ;
 

app/Repositories/Account/AccountTasker.php

@@ -50,10 +50,10 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface
         $yesterday       = clone $start;
         $yesterday->subDay()->endOfDay(); // exactly up until $start but NOT including.
         $end->endOfDay();                 // needs to be end of day to be correct.
-        Log::debug(sprintf('getAccountReport: finalAccountsBalance("%s")', $yesterday->format('Y-m-d H:i:s')));
-        Log::debug(sprintf('getAccountReport: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
-        $startSet        = Steam::finalAccountsBalance($accounts, $yesterday);
-        $endSet          = Steam::finalAccountsBalance($accounts, $end);
+        Log::debug(sprintf('getAccountReport: accountsBalancesOptimized("%s")', $yesterday->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('getAccountReport: accountsBalancesOptimized("%s")', $end->format('Y-m-d H:i:s')));
+        $startSet        = Steam::accountsBalancesOptimized($accounts, $yesterday);
+        $endSet          = Steam::accountsBalancesOptimized($accounts, $end);
         Log::debug('Start of accountreport');
 
         /** @var AccountRepositoryInterface $repository */

app/Repositories/AuditLogEntry/ALERepository.php

@@ -52,4 +52,10 @@ class ALERepository implements ALERepositoryInterface
 
         return $auditLogEntry;
     }
+
+    public function getForId(string $model, int $modelId): Collection
+    {
+        // all Models have an ID.
+        return AuditLogEntry::where('auditable_id', $modelId)->where('auditable_type', $model)->get();
+    }
 }

app/Repositories/AuditLogEntry/ALERepositoryInterface.php

@@ -46,5 +46,7 @@ interface ALERepositoryInterface
 {
     public function getForObject(Model $model): Collection;
 
+    public function getForId(string $model, int $modelId): Collection;
+
     public function store(array $data): AuditLogEntry;
 }

app/Services/Webhook/StandardWebhookSender.php

@@ -32,6 +32,7 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
+use Illuminate\Support\Facades\Log;
 use JsonException;
 
 use function Safe\json_encode;
@@ -65,9 +66,9 @@ class StandardWebhookSender implements WebhookSenderInterface
         try {
             $signature = $signatureGenerator->generate($this->message);
         } catch (FireflyException $e) {
-            app('log')->error('Did not send message because of a Firefly III Exception.');
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
+            Log::error('Did not send message because of a Firefly III Exception.');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             $attempt                = new WebhookAttempt();
             $attempt->webhookMessage()->associate($this->message);
             $attempt->status_code   = 0;
@@ -80,14 +81,14 @@ class StandardWebhookSender implements WebhookSenderInterface
             return;
         }
 
-        app('log')->debug(sprintf('Trying to send webhook message #%d', $this->message->id));
+        Log::debug(sprintf('Trying to send webhook message #%d', $this->message->id));
 
         try {
             $json = json_encode($this->message->message, JSON_THROW_ON_ERROR);
         } catch (JsonException $e) {
-            app('log')->error('Did not send message because of a JSON error.');
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
+            Log::error('Did not send message because of a JSON error.');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
             $attempt                = new WebhookAttempt();
             $attempt->webhookMessage()->associate($this->message);
             $attempt->status_code   = 0;
@@ -115,9 +116,9 @@ class StandardWebhookSender implements WebhookSenderInterface
         try {
             $res = $client->request('POST', $this->message->webhook->url, $options);
         } catch (ConnectException|RequestException $e) {
-            app('log')->error('The webhook could NOT be submitted but Firefly III caught the error below.');
-            app('log')->error($e->getMessage());
-            app('log')->error($e->getTraceAsString());
+            Log::error('The webhook could NOT be submitted but Firefly III caught the error below.');
+            Log::error($e->getMessage());
+            Log::error($e->getTraceAsString());
 
             $logs                   = sprintf("%s\n%s", $e->getMessage(), $e->getTraceAsString());
 
@@ -130,9 +131,9 @@ class StandardWebhookSender implements WebhookSenderInterface
             $attempt->status_code   = 0;
             if (method_exists($e, 'hasResponse') && method_exists($e, 'getResponse')) {
                 $attempt->status_code = $e->hasResponse() ? $e->getResponse()->getStatusCode() : 0;
-                app('log')->error(sprintf('The status code of the error response is: %d', $attempt->status_code));
+                Log::error(sprintf('The status code of the error response is: %d', $attempt->status_code));
                 $body                 = (string) ($e->hasResponse() ? $e->getResponse()->getBody() : '');
-                app('log')->error(sprintf('The body of the error response is: %s', $body));
+                Log::error(sprintf('The body of the error response is: %s', $body));
             }
             $attempt->logs          = $logs;
             $attempt->save();
@@ -142,9 +143,9 @@ class StandardWebhookSender implements WebhookSenderInterface
         $this->message->sent = true;
         $this->message->save();
 
-        app('log')->debug(sprintf('Webhook message #%d was sent. Status code %d', $this->message->id, $res->getStatusCode()));
-        app('log')->debug(sprintf('Webhook request body size: %d bytes', strlen($json)));
-        app('log')->debug(sprintf('Response body: %s', $res->getBody()));
+        Log::debug(sprintf('Webhook message #%d was sent. Status code %d', $this->message->id, $res->getStatusCode()));
+        Log::debug(sprintf('Webhook request body size: %d bytes', strlen($json)));
+        Log::debug(sprintf('Response body: %s', $res->getBody()));
     }
 
     public function setMessage(WebhookMessage $message): void

app/Support/Amount.php

@@ -29,9 +29,9 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Singleton\PreferencesSingleton;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
 use NumberFormatter;
 
 /**
@@ -116,11 +116,28 @@ class Amount
 
     public function convertToPrimary(?User $user = null): bool
     {
+        $instance = PreferencesSingleton::getInstance();
         if (!$user instanceof User) {
-            return true === Preferences::get('convert_to_primary', false)->data && true === config('cer.enabled');
+            $pref = $instance->getPreference('convert_to_primary_no_user');
+            if (null === $pref) {
+                $res = true === Preferences::get('convert_to_primary', false)->data && true === config('cer.enabled');
+                $instance->setPreference('convert_to_primary_no_user', $res);
+
+                return $res;
+            }
+
+            return $pref;
+        }
+        $key      = sprintf('convert_to_primary_%d', $user->id);
+        $pref     = $instance->getPreference($key);
+        if (null === $pref) {
+            $res = true === Preferences::getForUser($user, 'convert_to_primary', false)->data && true === config('cer.enabled');
+            $instance->setPreference($key, $res);
+
+            return $res;
         }
 
-        return true === Preferences::getForUser($user, 'convert_to_primary', false)->data && true === config('cer.enabled');
+        return $pref;
     }
 
     public function getPrimaryCurrency(): TransactionCurrency

app/Support/Cronjobs/AutoBudgetCronjob.php

@@ -28,6 +28,7 @@ use Carbon\Carbon;
 use FireflyIII\Jobs\CreateAutoBudgetLimits;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AutoBudgetCronjob
@@ -42,22 +43,22 @@ class AutoBudgetCronjob extends AbstractCronjob
         $diff          = Carbon::now()->getTimestamp() - $lastTime;
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
         if (0 === $lastTime) {
-            app('log')->info('Auto budget cron-job has never fired before.');
+            Log::info('Auto budget cron-job has never fired before.');
         }
         // less than half a day ago:
         if ($lastTime > 0 && $diff <= 43200) {
-            app('log')->info(sprintf('It has been %s since the auto budget cron-job has fired.', $diffForHumans));
+            Log::info(sprintf('It has been %s since the auto budget cron-job has fired.', $diffForHumans));
             if (false === $this->force) {
-                app('log')->info('The auto budget cron-job will not fire now.');
+                Log::info('The auto budget cron-job will not fire now.');
                 $this->message = sprintf('It has been %s since the auto budget cron-job has fired. It will not fire now.', $diffForHumans);
 
                 return;
             }
-            app('log')->info('Execution of the auto budget cron-job has been FORCED.');
+            Log::info('Execution of the auto budget cron-job has been FORCED.');
         }
 
         if ($lastTime > 0 && $diff > 43200) {
-            app('log')->info(sprintf('It has been %s since the auto budget cron-job has fired. It will fire now!', $diffForHumans));
+            Log::info(sprintf('It has been %s since the auto budget cron-job has fired. It will fire now!', $diffForHumans));
         }
 
         $this->fireAutoBudget();
@@ -66,7 +67,7 @@ class AutoBudgetCronjob extends AbstractCronjob
 
     private function fireAutoBudget(): void
     {
-        app('log')->info(sprintf('Will now fire auto budget cron job task for date "%s".', $this->date->format('Y-m-d')));
+        Log::info(sprintf('Will now fire auto budget cron job task for date "%s".', $this->date->format('Y-m-d')));
 
         /** @var CreateAutoBudgetLimits $job */
         $job                = app(CreateAutoBudgetLimits::class, [$this->date]);
@@ -80,6 +81,6 @@ class AutoBudgetCronjob extends AbstractCronjob
         $this->message      = 'Auto-budget cron job fired successfully.';
 
         FireflyConfig::set('last_ab_job', (int) $this->date->format('U'));
-        app('log')->info('Done with auto budget cron job task.');
+        Log::info('Done with auto budget cron job task.');
     }
 }

app/Support/Cronjobs/BillWarningCronjob.php

@@ -28,6 +28,8 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Jobs\WarnAboutBills;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BillWarningCronjob
@@ -39,22 +41,22 @@ class BillWarningCronjob extends AbstractCronjob
      */
     public function fire(): void
     {
-        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        Log::debug(sprintf('Now in %s', __METHOD__));
 
         /** @var Configuration $config */
-        $config        = app('fireflyconfig')->get('last_bw_job', 0);
+        $config        = FireflyConfig::get('last_bw_job', 0);
         $lastTime      = (int) $config->data;
         $diff          = Carbon::now()->getTimestamp() - $lastTime;
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
 
         if (0 === $lastTime) {
-            app('log')->info('The bill notification cron-job has never fired before.');
+            Log::info('The bill notification cron-job has never fired before.');
         }
         // less than half a day ago:
         if ($lastTime > 0 && $diff <= 43200) {
-            app('log')->info(sprintf('It has been %s since the bill notification cron-job has fired.', $diffForHumans));
+            Log::info(sprintf('It has been %s since the bill notification cron-job has fired.', $diffForHumans));
             if (false === $this->force) {
-                app('log')->info('The cron-job will not fire now.');
+                Log::info('The cron-job will not fire now.');
                 $this->message      = sprintf('It has been %s since the bill notification cron-job has fired. It will not fire now.', $diffForHumans);
                 $this->jobFired     = false;
                 $this->jobErrored   = false;
@@ -63,11 +65,11 @@ class BillWarningCronjob extends AbstractCronjob
                 return;
             }
 
-            app('log')->info('Execution of the bill notification cron-job has been FORCED.');
+            Log::info('Execution of the bill notification cron-job has been FORCED.');
         }
 
         if ($lastTime > 0 && $diff > 43200) {
-            app('log')->info(sprintf('It has been %s since the bill notification cron-job has fired. It will fire now!', $diffForHumans));
+            Log::info(sprintf('It has been %s since the bill notification cron-job has fired. It will fire now!', $diffForHumans));
         }
 
         $this->fireWarnings();
@@ -77,7 +79,7 @@ class BillWarningCronjob extends AbstractCronjob
 
     private function fireWarnings(): void
     {
-        app('log')->info(sprintf('Will now fire bill notification job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
+        Log::info(sprintf('Will now fire bill notification job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
 
         /** @var WarnAboutBills $job */
         $job                = app(WarnAboutBills::class);
@@ -91,8 +93,8 @@ class BillWarningCronjob extends AbstractCronjob
         $this->jobSucceeded = true;
         $this->message      = 'Bill notification cron job fired successfully.';
 
-        app('fireflyconfig')->set('last_bw_job', (int) $this->date->format('U'));
-        app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
-        app('log')->info('Done with bill notification cron job task.');
+        FireflyConfig::set('last_bw_job', (int) $this->date->format('U'));
+        Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
+        Log::info('Done with bill notification cron job task.');
     }
 }

app/Support/Cronjobs/ExchangeRatesCronjob.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Support\Cronjobs;
 use Carbon\Carbon;
 use FireflyIII\Jobs\DownloadExchangeRates;
 use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -37,7 +38,7 @@ class ExchangeRatesCronjob extends AbstractCronjob
     public function fire(): void
     {
         /** @var Configuration $config */
-        $config        = app('fireflyconfig')->get('last_cer_job', 0);
+        $config        = FireflyConfig::get('last_cer_job', 0);
         $lastTime      = (int) $config->data;
         $diff          = Carbon::now()->getTimestamp() - $lastTime;
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
@@ -80,7 +81,7 @@ class ExchangeRatesCronjob extends AbstractCronjob
         $this->jobSucceeded = true;
         $this->message      = 'Exchange rates cron job fired successfully.';
 
-        app('fireflyconfig')->set('last_cer_job', (int) $this->date->format('U'));
+        FireflyConfig::set('last_cer_job', (int) $this->date->format('U'));
         Log::info('Done with exchange rates job task.');
     }
 }

app/Support/Cronjobs/UpdateCheckCronjob.php

@@ -41,7 +41,7 @@ class UpdateCheckCronjob extends AbstractCronjob
         Log::debug('Now in checkForUpdates()');
 
         // should not check for updates:
-        $permission         = app('fireflyconfig')->get('permission_update_check', -1);
+        $permission         = FireflyConfig::get('permission_update_check', -1);
         $value              = (int) $permission->data;
         if (1 !== $value) {
             Log::debug('Update check is not enabled.');

app/Support/Cronjobs/WebhookCronjob.php

@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * RecurringCronjob.php
+ * Copyright (c) 2019 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/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Cronjobs;
+
+use Carbon\Carbon;
+use FireflyIII\Events\RequestedSendWebhookMessages;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Configuration;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Class WebhookCronjob
+ */
+class WebhookCronjob extends AbstractCronjob
+{
+    /**
+     * @throws FireflyException
+     */
+    public function fire(): void
+    {
+        Log::debug(sprintf('Now in %s', __METHOD__));
+
+        /** @var Configuration $config */
+        $config        = FireflyConfig::get('last_webhook_job', 0);
+        $lastTime      = (int) $config->data;
+        $diff          = Carbon::now()->getTimestamp() - $lastTime;
+        $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
+
+        if (0 === $lastTime) {
+            Log::info('The webhook cron-job has never fired before.');
+        }
+        // less than ten minutes ago.
+        if ($lastTime > 0 && $diff <= 600) {
+            Log::info(sprintf('It has been %s since the webhook cron-job has fired.', $diffForHumans));
+            if (false === $this->force) {
+                Log::info('The cron-job will not fire now.');
+                $this->message      = sprintf('It has been %s since the webhook cron-job has fired. It will not fire now.', $diffForHumans);
+                $this->jobFired     = false;
+                $this->jobErrored   = false;
+                $this->jobSucceeded = false;
+
+                return;
+            }
+
+            Log::info('Execution of the webhook cron-job has been FORCED.');
+        }
+
+        if ($lastTime > 0 && $diff > 600) {
+            Log::info(sprintf('It has been %s since the webhook cron-job has fired. It will fire now!', $diffForHumans));
+        }
+
+        $this->fireWebhookmessages();
+
+        app('preferences')->mark();
+    }
+
+    private function fireWebhookmessages(): void
+    {
+        Log::info(sprintf('Will now send webhook messages for date "%s".', $this->date->format('Y-m-d H:i:s')));
+
+        Log::debug('send event RequestedSendWebhookMessages through cron job.');
+        event(new RequestedSendWebhookMessages());
+
+        // get stuff from job:
+        $this->jobFired     = true;
+        $this->jobErrored   = false;
+        $this->jobSucceeded = true;
+        $this->message      = 'Send webhook messages cron job fired successfully.';
+
+        FireflyConfig::set('last_webhook_job', (int) $this->date->format('U'));
+        Log::info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
+        Log::info('Done with webhook cron job task.');
+    }
+}

app/Support/Debug/Timer.php

@@ -28,19 +28,34 @@ use Illuminate\Support\Facades\Log;
 
 class Timer
 {
-    private static array $times = [];
+    private array         $times    = [];
+    private static ?Timer $instance = null;
 
-    public static function start(string $title): void
+    private function __construct()
     {
-        self::$times[$title] = microtime(true);
+        // Private constructor to prevent direct instantiation.
     }
 
-    public static function stop(string $title): void
+    public static function getInstance(): self
     {
-        $start = self::$times[$title] ?? 0;
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    public function start(string $title): void
+    {
+        $this->times[$title] = microtime(true);
+    }
+
+    public function stop(string $title): void
+    {
+        $start = $this->times[$title] ?? 0;
         $end   = microtime(true);
         $diff  = $end - $start;
-        unset(self::$times[$title]);
+        unset($this->times[$title]);
         Log::debug(sprintf('Timer "%s" took %f seconds', $title, $diff));
     }
 }

app/Support/Http/Controllers/ChartGeneration.php

@@ -67,7 +67,7 @@ trait ChartGeneration
         /** @var AccountRepositoryInterface $accountRepos */
         $accountRepos     = app(AccountRepositoryInterface::class);
 
-        $default          = app('amount')->getPrimaryCurrency();
+        $primary          = app('amount')->getPrimaryCurrency();
         $chartData        = [];
 
         Log::debug(sprintf('Start of accountBalanceChart(list, %s, %s)', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
@@ -75,10 +75,10 @@ trait ChartGeneration
         /** @var Account $account */
         foreach ($accounts as $account) {
             Log::debug(sprintf('Now at account #%d ("%s)', $account->id, $account->name));
-            $currency     = $accountRepos->getAccountCurrency($account) ?? $default;
-            $usePrimary   = $convertToPrimary && $default->id !== $currency->id;
+            $currency     = $accountRepos->getAccountCurrency($account) ?? $primary;
+            $usePrimary   = $convertToPrimary && $primary->id !== $currency->id;
             $field        = $convertToPrimary ? 'pc_balance' : 'balance';
-            $currency     = $usePrimary ? $default : $currency;
+            $currency     = $usePrimary ? $primary : $currency;
             Log::debug(sprintf('Will use field %s', $field));
             $currentSet   = [
                 'label'           => $account->name,

app/Support/Http/Controllers/CronRunner.php

@@ -30,6 +30,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\WebhookCronjob;
 
 /**
  * Trait CronRunner
@@ -62,6 +63,32 @@ trait CronRunner
         ];
     }
 
+    protected function webhookCronJob(bool $force, Carbon $date): array
+    {
+        /** @var WebhookCronjob $webhook */
+        $webhook = app(WebhookCronjob::class);
+        $webhook->setForce($force);
+        $webhook->setDate($date);
+
+        try {
+            $webhook->fire();
+        } catch (FireflyException $e) {
+            return [
+                'job_fired'     => false,
+                'job_succeeded' => false,
+                'job_errored'   => true,
+                'message'       => $e->getMessage(),
+            ];
+        }
+
+        return [
+            'job_fired'     => $webhook->jobFired,
+            'job_succeeded' => $webhook->jobSucceeded,
+            'job_errored'   => $webhook->jobErrored,
+            'message'       => $webhook->message,
+        ];
+    }
+
     protected function exchangeRatesCronJob(bool $force, Carbon $date): array
     {
         /** @var ExchangeRatesCronjob $exchangeRates */

app/Support/Http/Controllers/PeriodOverview.php

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Debug\Timer;
+use FireflyIII\Support\Facades\Navigation;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -79,9 +80,10 @@ trait PeriodOverview
     protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
     {
         Log::debug('Now in getAccountPeriodOverview()');
-        Timer::start('account-period-total');
+        $timer                   = Timer::getInstance();
+        $timer->start('account-period-total');
         $this->accountRepository = app(AccountRepositoryInterface::class);
-        $range                   = app('navigation')->getViewRange(true);
+        $range                   = Navigation::getViewRange(true);
         [$start, $end]           = $end < $start ? [$end, $start] : [$start, $end];
 
         // properties for cache
@@ -91,32 +93,30 @@ trait PeriodOverview
         $cache->addProperty('account-show-period-entries');
         $cache->addProperty($account->id);
         if ($cache->has()) {
+            Log::debug('Return CACHED in getAccountPeriodOverview()');
+
             return $cache->get();
         }
 
         /** @var array $dates */
-        $dates                   = app('navigation')->blockPeriods($start, $end, $range);
+        $dates                   = Navigation::blockPeriods($start, $end, $range);
         $entries                 = [];
-        $spent                   = [];
-        $earned                  = [];
-        $transferredAway         = [];
-        $transferredIn           = [];
 
         // run a custom query because doing this with the collector is MEGA slow.
+        $timer->start('account-period-collect');
         $transactions            = $this->accountRepository->periodCollection($account, $start, $end);
-
+        $timer->stop('account-period-collect');
         // loop dates
         Log::debug(sprintf('Count of loops: %d', count($dates)));
         $loops                   = 0;
         // stop after 10 loops for memory reasons.
+        $timer->start('account-period-loop');
         foreach ($dates as $currentDate) {
-            $title                            = app('navigation')->periodShow($currentDate['start'], $currentDate['period']);
-            if ($loops < 10) {
-                [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
-                [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
-                [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
-                [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
-            }
+            $title                            = Navigation::periodShow($currentDate['start'], $currentDate['period']);
+            [$transactions, $spent]           = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
+            [$transactions, $earned]          = $this->filterTransactionsByType(TransactionTypeEnum::DEPOSIT, $transactions, $currentDate['start'], $currentDate['end']);
+            [$transactions, $transferredAway] = $this->filterTransfers('away', $transactions, $currentDate['start'], $currentDate['end']);
+            [$transactions, $transferredIn]   = $this->filterTransfers('in', $transactions, $currentDate['start'], $currentDate['end']);
             $entries[]
                                               = [
                                                   'title'              => $title,
@@ -129,8 +129,9 @@ trait PeriodOverview
                                               ];
             ++$loops;
         }
+        $timer->stop('account-period-loop');
         $cache->store($entries);
-        Timer::stop('account-period-total');
+        $timer->stop('account-period-total');
         Log::debug('End of getAccountPeriodOverview()');
 
         return $entries;
@@ -138,7 +139,8 @@ trait PeriodOverview
 
     private function filterTransactionsByType(TransactionTypeEnum $type, array $transactions, Carbon $start, Carbon $end): array
     {
-        $result = [];
+        $result   = [];
+        $filtered = [];
 
         /**
          * @var int   $index
@@ -146,38 +148,46 @@ trait PeriodOverview
          */
         foreach ($transactions as $index => $item) {
             $date = Carbon::parse($item['date']);
-            if ($item['type'] === $type->value && $date >= $start && $date <= $end) {
+            $fits = $item['type'] === $type->value && $date >= $start && $date <= $end;
+            if ($fits) {
                 $result[] = $item;
                 unset($transactions[$index]);
             }
+            if (!$fits) {
+                $filtered[] = $item;
+            }
         }
 
-        return [$transactions, $result];
+        return [$filtered, $result];
     }
 
     private function filterTransfers(string $direction, array $transactions, Carbon $start, Carbon $end): array
     {
-        $result = [];
+        $result   = [];
+        $filtered = [];
 
         /**
          * @var int   $index
          * @var array $item
          */
         foreach ($transactions as $index => $item) {
-            $date = Carbon::parse($item['date']);
+            $date       = Carbon::parse($item['date']);
             if ($date >= $start && $date <= $end) {
-                if ('away' === $direction && -1 === bccomp((string) $item['amount'], '0')) {
+                if ('away' === $direction && -1 === bccomp((string)$item['amount'], '0')) {
                     $result[] = $item;
-                    unset($transactions[$index]);
+
+                    continue;
                 }
-                if ('in' === $direction && 1 === bccomp((string) $item['amount'], '0')) {
+                if ('in' === $direction && 1 === bccomp((string)$item['amount'], '0')) {
                     $result[] = $item;
-                    unset($transactions[$index]);
+
+                    continue;
                 }
             }
+            $filtered[] = $item;
         }
 
-        return [$transactions, $result];
+        return [$filtered, $result];
     }
 
     private function groupByCurrency(array $journals): array
@@ -186,7 +196,7 @@ trait PeriodOverview
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            $currencyId                    = (int) $journal['currency_id'];
+            $currencyId                    = (int)$journal['currency_id'];
             $currencyCode                  = $journal['currency_code'];
             $currencyName                  = $journal['currency_name'];
             $currencySymbol                = $journal['currency_symbol'];
@@ -203,7 +213,7 @@ trait PeriodOverview
                 $currencyDecimalPlaces = $this->primaryCurrency->decimal_places;
             }
             if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id && $foreignCurrencyId === $this->primaryCurrency->id) {
-                $currencyId            = (int) $foreignCurrencyId;
+                $currencyId            = (int)$foreignCurrencyId;
                 $currencyCode          = $journal['foreign_currency_code'];
                 $currencyName          = $journal['foreign_currency_name'];
                 $currencySymbol        = $journal['foreign_currency_symbol'];
@@ -235,7 +245,7 @@ trait PeriodOverview
      */
     protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array
     {
-        $range         = app('navigation')->getViewRange(true);
+        $range         = Navigation::getViewRange(true);
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
 
         // properties for entries with their amounts.
@@ -251,7 +261,7 @@ trait PeriodOverview
         }
 
         /** @var array $dates */
-        $dates         = app('navigation')->blockPeriods($start, $end, $range);
+        $dates         = Navigation::blockPeriods($start, $end, $range);
         $entries       = [];
 
         // collect all expenses in this period:
@@ -281,7 +291,7 @@ trait PeriodOverview
             $spent       = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);
             $earned      = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']);
             $transferred = $this->filterJournalsByDate($transferSet, $currentDate['start'], $currentDate['end']);
-            $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
+            $title       = Navigation::periodShow($currentDate['end'], $currentDate['period']);
             $entries[]
                          = [
                              'transactions'       => 0,
@@ -327,7 +337,7 @@ trait PeriodOverview
      */
     protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array
     {
-        $range         = app('navigation')->getViewRange(true);
+        $range         = Navigation::getViewRange(true);
 
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
 
@@ -342,7 +352,7 @@ trait PeriodOverview
         }
 
         /** @var array $dates */
-        $dates         = app('navigation')->blockPeriods($start, $end, $range);
+        $dates         = Navigation::blockPeriods($start, $end, $range);
         $entries       = [];
 
         // get all expenses without a budget.
@@ -353,7 +363,7 @@ trait PeriodOverview
 
         foreach ($dates as $currentDate) {
             $set   = $this->filterJournalsByDate($journals, $currentDate['start'], $currentDate['end']);
-            $title = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
+            $title = Navigation::periodShow($currentDate['end'], $currentDate['period']);
             $entries[]
                    = [
                        'title'              => $title,
@@ -380,17 +390,17 @@ trait PeriodOverview
     protected function getNoCategoryPeriodOverview(Carbon $theDate): array
     {
         app('log')->debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d')));
-        $range       = app('navigation')->getViewRange(true);
+        $range       = Navigation::getViewRange(true);
         $first       = $this->journalRepos->firstNull();
         $start       = null === $first ? new Carbon() : $first->date;
         $end         = clone $theDate;
-        $end         = app('navigation')->endOfPeriod($end, $range);
+        $end         = Navigation::endOfPeriod($end, $range);
 
         app('log')->debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d')));
         app('log')->debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d')));
 
         // properties for cache
-        $dates       = app('navigation')->blockPeriods($start, $end, $range);
+        $dates       = Navigation::blockPeriods($start, $end, $range);
         $entries     = [];
 
         // collect all expenses in this period:
@@ -422,7 +432,7 @@ trait PeriodOverview
             $spent       = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);
             $earned      = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']);
             $transferred = $this->filterJournalsByDate($transferSet, $currentDate['start'], $currentDate['end']);
-            $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
+            $title       = Navigation::periodShow($currentDate['end'], $currentDate['period']);
             $entries[]
                          = [
                              'title'              => $title,
@@ -445,7 +455,7 @@ trait PeriodOverview
      */
     protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags.
     {
-        $range         = app('navigation')->getViewRange(true);
+        $range         = Navigation::getViewRange(true);
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
 
         // properties for cache
@@ -459,7 +469,7 @@ trait PeriodOverview
         }
 
         /** @var array $dates */
-        $dates         = app('navigation')->blockPeriods($start, $end, $range);
+        $dates         = Navigation::blockPeriods($start, $end, $range);
         $entries       = [];
 
         // collect all expenses in this period:
@@ -495,7 +505,7 @@ trait PeriodOverview
             $spent       = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);
             $earned      = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']);
             $transferred = $this->filterJournalsByDate($transferSet, $currentDate['start'], $currentDate['end']);
-            $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
+            $title       = Navigation::periodShow($currentDate['end'], $currentDate['period']);
             $entries[]
                          = [
                              'transactions'       => 0,
@@ -540,7 +550,7 @@ trait PeriodOverview
      */
     protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array
     {
-        $range         = app('navigation')->getViewRange(true);
+        $range         = Navigation::getViewRange(true);
         $types         = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));
         [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
 
@@ -555,7 +565,7 @@ trait PeriodOverview
         }
 
         /** @var array $dates */
-        $dates         = app('navigation')->blockPeriods($start, $end, $range);
+        $dates         = Navigation::blockPeriods($start, $end, $range);
         $entries       = [];
         $spent         = [];
         $earned        = [];
@@ -567,7 +577,7 @@ trait PeriodOverview
         $loops         = 0;
 
         foreach ($dates as $currentDate) {
-            $title       = app('navigation')->periodShow($currentDate['end'], $currentDate['period']);
+            $title = Navigation::periodShow($currentDate['end'], $currentDate['period']);
 
             if ($loops < 10) {
                 // set to correct array
@@ -582,14 +592,14 @@ trait PeriodOverview
                 }
             }
             $entries[]
-                         = [
-                             'title'              => $title,
-                             'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
-                             'total_transactions' => count($spent) + count($earned) + count($transferred),
-                             'spent'              => $this->groupByCurrency($spent),
-                             'earned'             => $this->groupByCurrency($earned),
-                             'transferred'        => $this->groupByCurrency($transferred),
-                         ];
+                   = [
+                       'title'              => $title,
+                       'route'              => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
+                       'total_transactions' => count($spent) + count($earned) + count($transferred),
+                       'spent'              => $this->groupByCurrency($spent),
+                       'earned'             => $this->groupByCurrency($earned),
+                       'transferred'        => $this->groupByCurrency($transferred),
+                   ];
             ++$loops;
         }
 
@@ -605,7 +615,7 @@ trait PeriodOverview
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            if ($account->id === (int) $journal['source_account_id']) {
+            if ($account->id === (int)$journal['source_account_id']) {
                 $return[] = $journal;
             }
         }
@@ -622,7 +632,7 @@ trait PeriodOverview
 
         /** @var array $journal */
         foreach ($journals as $journal) {
-            if ($account->id === (int) $journal['destination_account_id']) {
+            if ($account->id === (int)$journal['destination_account_id']) {
                 $return[] = $journal;
             }
         }

app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php

@@ -56,6 +56,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
         $this->collectPaidDates();
         $this->collectPayDates();
 
+
         // TODO clean me up.
 
         $notes            = $this->notes;
@@ -344,7 +345,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
 
     private function getLastPaidDate(array $paidData): ?Carbon
     {
-        Log::debug('getLastPaidDate()');
+        // Log::debug('getLastPaidDate()');
         $return = null;
         foreach ($paidData as $entry) {
             if (null !== $return) {
@@ -353,15 +354,15 @@ class SubscriptionEnrichment implements EnrichmentInterface
                 if ($current->gt($return)) {
                     $return = clone $current;
                 }
-                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('[a] Last paid date is: %s', $return->format('Y-m-d')));
             }
             if (null === $return) {
                 /** @var Carbon $return */
                 $return = $entry['date_object'];
-                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('[b] Last paid date is: %s', $return->format('Y-m-d')));
             }
         }
-        Log::debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d')));
+        Log::debug(sprintf('[c] Last paid date is: "%s"', $return?->format('Y-m-d')));
 
         return $return;
     }

app/Support/Models/BillDateCalculator.php

@@ -110,8 +110,8 @@ class BillDateCalculator
             $currentStart      = clone $nextExpectedMatch;
 
             ++$loop;
-            if ($loop > 12) {
-                Log::debug('Loop is more than 12, so we break.');
+            if ($loop > 31) {
+                Log::debug('Loop is more than 31, so we break.');
 
                 break;
             }

app/Support/Preferences.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Support;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Preference;
+use FireflyIII\Support\Singleton\PreferencesSingleton;
 use FireflyIII\User;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Contracts\Encryption\EncryptException;
@@ -283,6 +284,12 @@ class Preferences
      */
     public function lastActivity(): string
     {
+        $instance     = PreferencesSingleton::getInstance();
+        $pref         = $instance->getPreference('last_activity');
+        if (null !== $pref) {
+            // Log::debug(sprintf('Found last activity in singleton: %s', $pref));
+            return $pref;
+        }
         $lastActivity = microtime();
         $preference   = $this->get('lastActivity', microtime());
 
@@ -292,13 +299,17 @@ class Preferences
         if (is_array($lastActivity)) {
             $lastActivity = implode(',', $lastActivity);
         }
+        $setting      = hash('sha256', (string) $lastActivity);
+        $instance->setPreference('last_activity', $setting);
 
-        return hash('sha256', (string) $lastActivity);
+        return $setting;
     }
 
     public function mark(): void
     {
         $this->set('lastActivity', microtime());
+        $instance = PreferencesSingleton::getInstance();
+        $instance->setPreference('last_activity', microtime());
         Session::forget('first');
     }
 

app/Support/Singleton/PreferencesSingleton.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\Singleton;
+
+class PreferencesSingleton
+{
+    private static ?PreferencesSingleton $instance = null;
+
+    private array $preferences                     = [];
+
+    private function __construct()
+    {
+        // Private constructor to prevent direct instantiation.
+    }
+
+    public static function getInstance(): self
+    {
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    public function resetPreferences(): void
+    {
+        $this->preferences = [];
+    }
+
+    public function setPreference(string $key, mixed $value): void
+    {
+        $this->preferences[$key] = $value;
+    }
+
+    public function getPreference(string $key): mixed
+    {
+        return $this->preferences[$key] ?? null;
+    }
+}

app/Support/Steam.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Singleton\PreferencesSingleton;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -321,44 +322,54 @@ class Steam
 
     public function accountsBalancesOptimized(Collection $accounts, Carbon $date, ?TransactionCurrency $primary = null, ?bool $convertToPrimary = null): array
     {
-        $result     = [];
+        Log::debug(sprintf('accountsBalancesOptimized: Called for %d account(s) with date/time "%s"', $accounts->count(), $date->toIso8601String()));
+        $result      = [];
         $convertToPrimary ??= Amount::convertToPrimary();
         $primary          ??= Amount::getPrimaryCurrency();
-        $currencies = $this->getCurrencies($accounts);
+        $currencies  = $this->getCurrencies($accounts);
 
         // balance(s) in all currencies for ALL accounts.
-        $array      = Transaction::whereIn('account_id', $accounts->pluck('id')->toArray())
+        $arrayOfSums = Transaction::whereIn('account_id', $accounts->pluck('id')->toArray())
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
             ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-            ->get(['transactions.account_id', 'transaction_currencies.code', 'transactions.amount'])->toArray()
+            ->groupBy(['transactions.account_id', 'transaction_currencies.code'])
+            ->get(['transactions.account_id', 'transaction_currencies.code', DB::raw('SUM(transactions.amount) as sum_of_amount')])->toArray()
         ;
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            // filter array back to this account:
-            $filtered             = array_filter($array, function ($item) use ($account) {
-                return (int)$item['account_id'] === $account->id;
-            });
-            $currency             = $currencies[$account->id];
             // this array is PER account, so we wait a bit before we change code here.
             $return               = [
                 'pc_balance' => '0',
                 'balance'    => '0', // this key is overwritten right away, but I must remember it is always created.
             ];
+            $currency             = $currencies[$account->id];
+
+            // second array
+            $accountSum           = array_filter($arrayOfSums, function ($entry) use ($account) {
+                return $entry['account_id'] === $account->id;
+            });
+            if (0 === count($accountSum)) {
+                $result[$account->id] = $return;
+
+                continue;
+            }
+            $accountSum           = array_values($accountSum)[0];
+            $sumsByCode           = [
+                $accountSum['code'] => $accountSum['sum_of_amount'],
+            ];
 
-            // balance(s) in all currencies.
-            $others               = $this->groupAndSumTransactions($filtered, 'code', 'amount');
             // Log::debug('All balances are (joined)', $others);
             // if there is no request to convert, take this as "balance" and "pc_balance".
-            $return['balance']    = $others[$currency->code] ?? '0';
+            $return['balance']    = $sumsByCode[$currency->code] ?? '0';
             if (!$convertToPrimary) {
                 unset($return['pc_balance']);
                 // Log::debug(sprintf('Set balance to %s, unset pc_balance', $return['balance']));
             }
             // if there is a request to convert, convert to "pc_balance" and use "balance" for whichever amount is in the primary currency.
             if ($convertToPrimary) {
-                $return['pc_balance'] = $this->convertAllBalances($others, $primary, $date); // todo sum all and convert.
+                $return['pc_balance'] = $this->convertAllBalances($sumsByCode, $primary, $date);
                 // Log::debug(sprintf('Set pc_balance to %s', $return['pc_balance']));
             }
 
@@ -377,7 +388,7 @@ class Steam
                 $return['balance'] = bcadd($return['balance'], $virtualBalance);
                 // Log::debug(sprintf('Virtual balance makes the (primary currency) total %s', $return['balance']));
             }
-            $final                = array_merge($return, $others);
+            $final                = array_merge($return, $sumsByCode);
             $result[$account->id] = $final;
             // Log::debug('Final balance is', $final);
         }
@@ -507,30 +518,27 @@ class Steam
     {
         $total     = '0';
         $converter = new ExchangeRateConverter();
+        $singleton = PreferencesSingleton::getInstance();
         foreach ($others as $key => $amount) {
-            $currency = TransactionCurrency::where('code', $key)->first();
+            $preference = $singleton->getPreference($key);
+            $currency   = $preference ?? TransactionCurrency::where('code', $key)->first();
             if (null === $currency) {
                 continue;
             }
-            $current  = $converter->convert($currency, $primary, $date, $amount);
-            Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $primary->code, $current));
-            $total    = bcadd($current, $total);
+            if (null === $preference) {
+                $singleton->setPreference($key, $currency);
+            }
+            $current    = $amount;
+            if ($currency->id !== $primary->id) {
+                $current = $converter->convert($currency, $primary, $date, $amount);
+                Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $primary->code, $current));
+            }
+            $total      = bcadd($current, $total);
         }
 
         return $total;
     }
 
-    public function finalAccountsBalance(Collection $accounts, Carbon $date): array
-    {
-        Log::debug(sprintf('finalAccountsBalance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
-        $balances = [];
-        foreach ($accounts as $account) {
-            $balances[$account->id] = $this->finalAccountBalance($account, $date);
-        }
-
-        return $balances;
-    }
-
     /**
      * @throws FireflyException
      */

changelog.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.3.0 - 2025-08-xx
+
+> ⚠️ Firefly III v6.3.0 introduces a lot of API changes that deal with multi-currency support. Make sure your beloved apps are updated to support this.
+
+### Added
+
+- [Issue 6836](https://github.com/firefly-iii/firefly-iii/issues/6836) (Send email about coming/past-due bills) reported by @elgatho
+- [Issue 9640](https://github.com/firefly-iii/firefly-iii/issues/9640) (UI Improvements for Rules) reported by @siriuspal
+- [Issue 9650](https://github.com/firefly-iii/firefly-iii/issues/9650) (Extra line in bills overview) reported by @poudenes
+- Add Arabic as language, translations follow.
+
+### Changed
+
+- [Issue 10071](https://github.com/firefly-iii/firefly-iii/issues/10071) (Allow toggling password field to text) reported by @ragul-engg
+- Renamed all instances of "default" and "native" currency to "primary" currency. This influences translations and API endpoints. The database is not changed because that's difficult to do reliably.
+
+### Removed
+
+- Any API-field called `default_*` or `native_*`. Use `primary_*` instead.
+- All v2 endpoints.
+
+### Fixed
+- [Issue 9849](https://github.com/firefly-iii/firefly-iii/issues/9849) ("Display native amounts" not taken into account in report's pie charts) reported by @polter-rnd 
+- [Issue 10565](https://github.com/firefly-iii/firefly-iii/issues/10565) (Unable to delete reconciliation transaction) reported by @berta24
+- [Issue 10600](https://github.com/firefly-iii/firefly-iii/issues/10600) (Show attachmen iccon when listing tranactions) reported by @JcMinarro
+- [Discussion 10618](https://github.com/orgs/firefly-iii/discussions/10618) (Starting balance includes transactions that occur at 00:00 on the 1st of month) started by @jteez
+- [Issue 10646](https://github.com/firefly-iii/firefly-iii/issues/10646) (Webhooks fire even if disabled) reported by @lvu
+- [Issue 10656](https://github.com/firefly-iii/firefly-iii/issues/10656) (spent info "per day" shows the period total) reported by @frank-bg
+- [Issue 10678](https://github.com/firefly-iii/firefly-iii/issues/10678) (Transactions from asset to liability account do not appear on category reports.) reported by @slackspace-io
+- [Issue 10687](https://github.com/firefly-iii/firefly-iii/issues/10687) (Creating new Piggy Bank via API fails (Unexpected empty currency)) reported by @Madnex
+- [Issue 10700](https://github.com/firefly-iii/firefly-iii/issues/10700) (Setting financial year date is inconsistent due to timezone calculations) reported by @AgeManning
+- [Issue 10702](https://github.com/firefly-iii/firefly-iii/issues/10702) (Wrong order of months in category report) reported by @kapuett
+- [Issue 10703](https://github.com/firefly-iii/firefly-iii/issues/10703) (Fire more than 5 webhooks in batch or through the cron job, and document it.) reported by @JC5
+- [Issue 10704](https://github.com/firefly-iii/firefly-iii/issues/10704) (Some triggers with rule automation seems to have an issue) reported by @Alienlog
+- [Issue 10706](https://github.com/firefly-iii/firefly-iii/issues/10706) (Add KRW in Default Currency List) reported by @readingsnail
+- [Issue 10708](https://github.com/firefly-iii/firefly-iii/issues/10708) (Incomplete display of a rule when a trigger negates "description caontains") reported by @dethegeek
+- [Issue 10709](https://github.com/firefly-iii/firefly-iii/issues/10709) (has_any_external_id search parameter invalid) reported by @Alienlog
+- Tag overview will no longer search for tags dated < 1970.
+
+### API
+
+- All remaining API v2 endpoints are deprecated and removed in favour of the API v1 endpoints.
+- All API read endpoints now support multi-currency. Fields such as the balance and amount fields will also be available as `pc_*`-fields. Objects with currency information also come with new `primary_currency_*` fields.
+- All API read endpoints are DB optimized and should be faster.
+- All documentation should be in sync again.
+- [More info in the docs](https://docs.firefly-iii.org/references/firefly-iii/api/).
+
 ## 6.2.21 - 2025-07-18
 
 ### Added

composer.lock

@@ -586,33 +586,32 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.0",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.3",
-                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25 || ^5.4"
+                "doctrine/coding-standard": "^12.0 || ^13.0",
+                "phpstan/phpstan": "^1.12 || ^2.0",
+                "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
+                "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^12.2"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                    "Doctrine\\Inflector\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -657,7 +656,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "source": "https://github.com/doctrine/inflector/tree/2.1.0"
             },
             "funding": [
                 {
@@ -673,7 +672,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2025-08-10T19:31:58+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -939,16 +938,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.3",
+            "version": "2.18.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5"
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/59a123a3d459c5a23055802237cb317f609867e5",
-                "reference": "59a123a3d459c5a23055802237cb317f609867e5",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/d2102955e48b9fd9ab24280a7ad12ed552752c4d",
+                "reference": "d2102955e48b9fd9ab24280a7ad12ed552752c4d",
                 "shasum": ""
             },
             "require": {
@@ -998,7 +997,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.3"
+                "source": "https://github.com/filp/whoops/tree/2.18.4"
             },
             "funding": [
                 {
@@ -1006,7 +1005,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-06-16T00:02:10+00:00"
+            "time": "2025-08-08T12:00:00+00:00"
         },
         {
             "name": "firebase/php-jwt",
@@ -1879,16 +1878,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.22.0",
+            "version": "v12.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3"
+                "reference": "2a0e9331a0db904236143fe915c281ff4be274a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3",
-                "reference": "6ab00c913ef6ec6fad0bd506f7452c0bb9e792c3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/2a0e9331a0db904236143fe915c281ff4be274a3",
+                "reference": "2a0e9331a0db904236143fe915c281ff4be274a3",
                 "shasum": ""
             },
             "require": {
@@ -1929,6 +1928,8 @@
                 "symfony/mailer": "^7.2.0",
                 "symfony/mime": "^7.2.0",
                 "symfony/polyfill-php83": "^1.31",
+                "symfony/polyfill-php84": "^1.31",
+                "symfony/polyfill-php85": "^1.31",
                 "symfony/process": "^7.2.0",
                 "symfony/routing": "^7.2.0",
                 "symfony/uid": "^7.2.0",
@@ -2090,7 +2091,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-08-07T13:49:53+00:00"
+            "time": "2025-08-12T17:35:05+00:00"
         },
         {
             "name": "laravel/passport",
@@ -8511,6 +8512,158 @@
             ],
             "time": "2024-09-09T11:45:10+00:00"
         },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/000df7860439609837bbe28670b0be15783b7fbf",
+                "reference": "000df7860439609837bbe28670b0be15783b7fbf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.32.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-20T12:04:08+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php85",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php85.git",
+                "reference": "6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd",
+                "reference": "6fedf31ce4e3648f4ff5ca58bfd53127d38f05fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php85\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.32.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-05-02T08:40:52+00:00"
+        },
         {
             "name": "symfony/polyfill-uuid",
             "version": "v1.32.0",
@@ -10347,16 +10500,16 @@
         },
         {
             "name": "driftingly/rector-laravel",
-            "version": "2.0.5",
+            "version": "2.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/driftingly/rector-laravel.git",
-                "reference": "ac61de4f267c23249d175d7fc9149fd01528567d"
+                "reference": "5be95811801fc06126dd844beaeb6a41721ba3d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/ac61de4f267c23249d175d7fc9149fd01528567d",
-                "reference": "ac61de4f267c23249d175d7fc9149fd01528567d",
+                "url": "https://api.github.com/repos/driftingly/rector-laravel/zipball/5be95811801fc06126dd844beaeb6a41721ba3d3",
+                "reference": "5be95811801fc06126dd844beaeb6a41721ba3d3",
                 "shasum": ""
             },
             "require": {
@@ -10376,9 +10529,9 @@
             "description": "Rector upgrades rules for Laravel Framework",
             "support": {
                 "issues": "https://github.com/driftingly/rector-laravel/issues",
-                "source": "https://github.com/driftingly/rector-laravel/tree/2.0.5"
+                "source": "https://github.com/driftingly/rector-laravel/tree/2.0.6"
             },
-            "time": "2025-05-14T17:30:41+00:00"
+            "time": "2025-08-08T22:10:01+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -11618,16 +11771,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.3.0",
+            "version": "12.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "264da860d6fe0d00582355a6ecbbf7ae57b44895"
+                "reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/264da860d6fe0d00582355a6ecbbf7ae57b44895",
-                "reference": "264da860d6fe0d00582355a6ecbbf7ae57b44895",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/429095031bd38cb5070ca44166bd9dd5a9245dd6",
+                "reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6",
                 "shasum": ""
             },
             "require": {
@@ -11637,7 +11790,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.13.3",
+                "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
@@ -11647,13 +11800,13 @@
                 "phpunit/php-text-template": "^5.0.0",
                 "phpunit/php-timer": "^8.0.0",
                 "sebastian/cli-parser": "^4.0.0",
-                "sebastian/comparator": "^7.1.0",
+                "sebastian/comparator": "^7.1.2",
                 "sebastian/diff": "^7.0.0",
                 "sebastian/environment": "^8.0.2",
                 "sebastian/exporter": "^7.0.0",
                 "sebastian/global-state": "^8.0.0",
                 "sebastian/object-enumerator": "^7.0.0",
-                "sebastian/type": "^6.0.2",
+                "sebastian/type": "^6.0.3",
                 "sebastian/version": "^6.0.0",
                 "staabm/side-effects-detector": "^1.0.5"
             },
@@ -11695,7 +11848,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.0"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.4"
             },
             "funding": [
                 {
@@ -11719,7 +11872,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-01T05:14:47+00:00"
+            "time": "2025-08-12T07:35:30+00:00"
         },
         {
             "name": "rector/rector",
@@ -11840,16 +11993,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "7.1.0",
+            "version": "7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "03d905327dccc0851c9a08d6a979dfc683826b6f"
+                "reference": "1a7c2bce03a13a457ed3c975dfd331b3b4b133aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/03d905327dccc0851c9a08d6a979dfc683826b6f",
-                "reference": "03d905327dccc0851c9a08d6a979dfc683826b6f",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1a7c2bce03a13a457ed3c975dfd331b3b4b133aa",
+                "reference": "1a7c2bce03a13a457ed3c975dfd331b3b4b133aa",
                 "shasum": ""
             },
             "require": {
@@ -11908,7 +12061,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.0"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.2"
             },
             "funding": [
                 {
@@ -11928,7 +12081,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-17T07:41:58+00:00"
+            "time": "2025-08-10T08:50:08+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -12057,16 +12210,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "8.0.2",
+            "version": "8.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "d364b9e5d0d3b18a2573351a1786fbf96b7e0792"
+                "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d364b9e5d0d3b18a2573351a1786fbf96b7e0792",
-                "reference": "d364b9e5d0d3b18a2573351a1786fbf96b7e0792",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/24a711b5c916efc6d6e62aa65aa2ec98fef77f68",
+                "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68",
                 "shasum": ""
             },
             "require": {
@@ -12109,7 +12262,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/8.0.2"
+                "source": "https://github.com/sebastianbergmann/environment/tree/8.0.3"
             },
             "funding": [
                 {
@@ -12129,7 +12282,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-21T15:05:44+00:00"
+            "time": "2025-08-12T14:11:56+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -12445,16 +12598,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "7.0.0",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "c405ae3a63e01b32eb71577f8ec1604e39858a7c"
+                "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/c405ae3a63e01b32eb71577f8ec1604e39858a7c",
-                "reference": "c405ae3a63e01b32eb71577f8ec1604e39858a7c",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/0b01998a7d5b1f122911a66bebcb8d46f0c82d8c",
+                "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c",
                 "shasum": ""
             },
             "require": {
@@ -12497,28 +12650,40 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
                 "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.0"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-07T05:00:01+00:00"
+            "time": "2025-08-13T04:44:59+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "6.0.2",
+            "version": "6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "1d7cd6e514384c36d7a390347f57c385d4be6069"
+                "reference": "e549163b9760b8f71f191651d22acf32d56d6d4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/1d7cd6e514384c36d7a390347f57c385d4be6069",
-                "reference": "1d7cd6e514384c36d7a390347f57c385d4be6069",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/e549163b9760b8f71f191651d22acf32d56d6d4d",
+                "reference": "e549163b9760b8f71f191651d22acf32d56d6d4d",
                 "shasum": ""
             },
             "require": {
@@ -12554,15 +12719,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "security": "https://github.com/sebastianbergmann/type/security/policy",
-                "source": "https://github.com/sebastianbergmann/type/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/type/tree/6.0.3"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/type",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-03-18T13:37:31+00:00"
+            "time": "2025-08-09T06:57:12+00:00"
         },
         {
             "name": "sebastian/version",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-08-08',
-    'build_time'                   => 1754630161,
+    'version'                      => 'develop/2025-08-13',
+    'build_time'                   => 1755064254,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

package-lock.json

@@ -1707,9 +1707,9 @@
             "license": "MIT"
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
-            "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+            "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
             "cpu": [
                 "ppc64"
             ],
@@ -1724,9 +1724,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
-            "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+            "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
             "cpu": [
                 "arm"
             ],
@@ -1741,9 +1741,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
-            "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+            "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
             "cpu": [
                 "arm64"
             ],
@@ -1758,9 +1758,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
-            "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+            "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
             "cpu": [
                 "x64"
             ],
@@ -1775,9 +1775,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
-            "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+            "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
             "cpu": [
                 "arm64"
             ],
@@ -1792,9 +1792,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
-            "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+            "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
             "cpu": [
                 "x64"
             ],
@@ -1809,9 +1809,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
             "cpu": [
                 "arm64"
             ],
@@ -1826,9 +1826,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
-            "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+            "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
             "cpu": [
                 "x64"
             ],
@@ -1843,9 +1843,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
-            "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+            "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
             "cpu": [
                 "arm"
             ],
@@ -1860,9 +1860,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
-            "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+            "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
             "cpu": [
                 "arm64"
             ],
@@ -1877,9 +1877,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
-            "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+            "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
             "cpu": [
                 "ia32"
             ],
@@ -1894,9 +1894,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
-            "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+            "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
             "cpu": [
                 "loong64"
             ],
@@ -1911,9 +1911,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
-            "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+            "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
             "cpu": [
                 "mips64el"
             ],
@@ -1928,9 +1928,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
-            "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+            "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
             "cpu": [
                 "ppc64"
             ],
@@ -1945,9 +1945,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
-            "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+            "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
             "cpu": [
                 "riscv64"
             ],
@@ -1962,9 +1962,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
-            "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+            "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
             "cpu": [
                 "s390x"
             ],
@@ -1979,9 +1979,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
-            "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+            "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
             "cpu": [
                 "x64"
             ],
@@ -1996,9 +1996,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2013,9 +2013,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+            "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
             "cpu": [
                 "x64"
             ],
@@ -2030,9 +2030,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2047,9 +2047,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+            "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
             "cpu": [
                 "x64"
             ],
@@ -2064,9 +2064,9 @@
             }
         },
         "node_modules/@esbuild/openharmony-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
-            "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+            "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
             "cpu": [
                 "arm64"
             ],
@@ -2081,9 +2081,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
-            "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+            "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
             "cpu": [
                 "x64"
             ],
@@ -2098,9 +2098,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
-            "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+            "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2115,9 +2115,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
-            "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+            "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
             "cpu": [
                 "ia32"
             ],
@@ -2132,9 +2132,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
-            "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+            "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
             "cpu": [
                 "x64"
             ],
@@ -2171,9 +2171,9 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.12",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-            "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2192,9 +2192,9 @@
             }
         },
         "node_modules/@jridgewell/source-map": {
-            "version": "0.3.10",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
-            "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
+            "version": "0.3.11",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+            "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2203,16 +2203,16 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-            "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.29",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-            "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+            "version": "0.3.30",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
+            "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3148,9 +3148,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.2.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz",
-            "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==",
+            "version": "24.2.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz",
+            "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4196,9 +4196,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap5-autocomplete": {
-            "version": "1.1.39",
-            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.39.tgz",
-            "integrity": "sha512-jsOqej5/hI2fTSlYqbuVt7EbJcGrUXH984jiNlgUk+nbh46vIcVimo/eIg0iqcDqs/sJvXD9O38XGV2XpVU7sA==",
+            "version": "1.1.40",
+            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.40.tgz",
+            "integrity": "sha512-fp2HDZule/qwC/hEftIO2gCcqsuBOH0Hv1KgoyiqI6Ny5s0THZYjQyqAE1RnN8qnR0mQXc/cEJTd7EKbqpoj0g==",
             "license": "MIT"
         },
         "node_modules/bootstrap5-tags": {
@@ -4326,9 +4326,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.25.1",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
-            "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
+            "version": "4.25.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
+            "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
             "dev": true,
             "funding": [
                 {
@@ -4346,8 +4346,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001726",
-                "electron-to-chromium": "^1.5.173",
+                "caniuse-lite": "^1.0.30001733",
+                "electron-to-chromium": "^1.5.199",
                 "node-releases": "^2.0.19",
                 "update-browserslist-db": "^1.1.3"
             },
@@ -4486,9 +4486,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001731",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
-            "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
+            "version": "1.0.30001734",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz",
+            "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==",
             "dev": true,
             "funding": [
                 {
@@ -5700,9 +5700,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.199",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
-            "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
+            "version": "1.5.200",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.200.tgz",
+            "integrity": "sha512-rFCxROw7aOe4uPTfIAx+rXv9cEcGx+buAF4npnhtTqCJk5KDFRnh3+KYj7rdVh6lsFt5/aPs+Irj9rZ33WMA7w==",
             "dev": true,
             "license": "ISC"
         },
@@ -5863,9 +5863,9 @@
             }
         },
         "node_modules/esbuild": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
-            "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+            "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -5876,32 +5876,32 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.8",
-                "@esbuild/android-arm": "0.25.8",
-                "@esbuild/android-arm64": "0.25.8",
-                "@esbuild/android-x64": "0.25.8",
-                "@esbuild/darwin-arm64": "0.25.8",
-                "@esbuild/darwin-x64": "0.25.8",
-                "@esbuild/freebsd-arm64": "0.25.8",
-                "@esbuild/freebsd-x64": "0.25.8",
-                "@esbuild/linux-arm": "0.25.8",
-                "@esbuild/linux-arm64": "0.25.8",
-                "@esbuild/linux-ia32": "0.25.8",
-                "@esbuild/linux-loong64": "0.25.8",
-                "@esbuild/linux-mips64el": "0.25.8",
-                "@esbuild/linux-ppc64": "0.25.8",
-                "@esbuild/linux-riscv64": "0.25.8",
-                "@esbuild/linux-s390x": "0.25.8",
-                "@esbuild/linux-x64": "0.25.8",
-                "@esbuild/netbsd-arm64": "0.25.8",
-                "@esbuild/netbsd-x64": "0.25.8",
-                "@esbuild/openbsd-arm64": "0.25.8",
-                "@esbuild/openbsd-x64": "0.25.8",
-                "@esbuild/openharmony-arm64": "0.25.8",
-                "@esbuild/sunos-x64": "0.25.8",
-                "@esbuild/win32-arm64": "0.25.8",
-                "@esbuild/win32-ia32": "0.25.8",
-                "@esbuild/win32-x64": "0.25.8"
+                "@esbuild/aix-ppc64": "0.25.9",
+                "@esbuild/android-arm": "0.25.9",
+                "@esbuild/android-arm64": "0.25.9",
+                "@esbuild/android-x64": "0.25.9",
+                "@esbuild/darwin-arm64": "0.25.9",
+                "@esbuild/darwin-x64": "0.25.9",
+                "@esbuild/freebsd-arm64": "0.25.9",
+                "@esbuild/freebsd-x64": "0.25.9",
+                "@esbuild/linux-arm": "0.25.9",
+                "@esbuild/linux-arm64": "0.25.9",
+                "@esbuild/linux-ia32": "0.25.9",
+                "@esbuild/linux-loong64": "0.25.9",
+                "@esbuild/linux-mips64el": "0.25.9",
+                "@esbuild/linux-ppc64": "0.25.9",
+                "@esbuild/linux-riscv64": "0.25.9",
+                "@esbuild/linux-s390x": "0.25.9",
+                "@esbuild/linux-x64": "0.25.9",
+                "@esbuild/netbsd-arm64": "0.25.9",
+                "@esbuild/netbsd-x64": "0.25.9",
+                "@esbuild/openbsd-arm64": "0.25.9",
+                "@esbuild/openbsd-x64": "0.25.9",
+                "@esbuild/openharmony-arm64": "0.25.9",
+                "@esbuild/sunos-x64": "0.25.9",
+                "@esbuild/win32-arm64": "0.25.9",
+                "@esbuild/win32-ia32": "0.25.9",
+                "@esbuild/win32-x64": "0.25.9"
             }
         },
         "node_modules/escalade": {
@@ -7052,9 +7052,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "25.3.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.3.2.tgz",
-            "integrity": "sha512-JSnbZDxRVbphc5jiptxr3o2zocy5dEqpVm9qCGdJwRNO+9saUJS0/u4LnM/13C23fUEWxAylPqKU/NpMV/IjqA==",
+            "version": "25.3.4",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.3.4.tgz",
+            "integrity": "sha512-AHklEYFLiRRxW1Cb6zE9lfnEtYvsydRC8nRS3RSKGX3zCqZ8nLZwMaUsrb80YuccPNv2RNokDL8LkTNnp+6mDw==",
             "funding": [
                 {
                     "type": "individual",
@@ -7631,9 +7631,9 @@
             }
         },
         "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+            "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11524,9 +11524,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.1.tgz",
-            "integrity": "sha512-yJ+Mp7OyV+4S+afWo+QyoL9jFWD11QFH0i5i7JypnfTcA1rmgxCbiA8WwAICDEtZ1Z1hzrVhN8R8rGTqkTY8ZQ==",
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
+            "integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11844,9 +11844,9 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.101.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.0.tgz",
-            "integrity": "sha512-B4t+nJqytPeuZlHuIKTbalhljIFXeNRqrUGAQgTGlfOl2lXXKXw+yZu6bicycP+PUlM44CxBjCFD6aciKFT3LQ==",
+            "version": "5.101.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.1.tgz",
+            "integrity": "sha512-rHY3vHXRbkSfhG6fH8zYQdth/BtDgXXuR2pHF++1f/EBkI8zkgM5XWfsC3BvOoW9pr1CvZ1qQCxhCEsbNgT50g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11860,7 +11860,7 @@
                 "acorn-import-phases": "^1.0.3",
                 "browserslist": "^4.24.0",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.2",
+                "enhanced-resolve": "^5.17.3",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",

readme.md

@@ -173,8 +173,6 @@ Over time, [many people have contributed to Firefly III](https://github.com/fire
 
 The Firefly III logo is made by the excellent Cherie Woo.
 
-<a href="https://hellogithub.com/repository/a8c64f04cb3643c2a4423c4ad924dec9" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=a8c64f04cb3643c2a4423c4ad924dec9&claim_uid=1bPi7O2rTGREZXN&theme=small" alt="Featured｜HelloGitHub" /></a>
-
 [packagist-shield]: https://img.shields.io/packagist/v/grumpydictator/firefly-iii.svg?style=flat-square
 [packagist-url]: https://packagist.org/packages/grumpydictator/firefly-iii
 [license-shield]: https://img.shields.io/github/license/firefly-iii/firefly-iii.svg?style=flat-square

resources/assets/v1/src/locales/af.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Confidential",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/ar.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u0633\u0631 \u0627\u0644\u0639\u0645\u064a\u0644",
         "profile_oauth_client_secret_expl": "\u0647\u0630\u0627 \u0647\u0648 \u0633\u0631 \u0627\u0644\u0639\u0645\u064a\u0644 \u0627\u0644\u062c\u062f\u064a\u062f \u0627\u0644\u062e\u0627\u0635 \u0628\u0643. \u0647\u0630\u0647 \u0647\u064a \u0627\u0644\u0645\u0631\u0629 \u0627\u0644\u0648\u062d\u064a\u062f\u0629 \u0627\u0644\u062a\u064a \u0633\u064a\u0638\u0647\u0631 \u0641\u064a\u0647\u0627 \u0641\u0644\u0627 \u062a\u0641\u0642\u062f\u0647! \u064a\u0645\u0643\u0646\u0643 \u0627\u0644\u0622\u0646 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0647\u0630\u0627 \u0627\u0644\u0633\u0631 \u0644\u0625\u062c\u0631\u0627\u0621 \u0637\u0644\u0628\u0627\u062a API.",
         "profile_oauth_confidential": "\u0633\u0631\u064a",
-        "profile_oauth_confidential_help": "\u064a\u062a\u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0639\u0645\u064a\u0644 \u0627\u0644\u0645\u0635\u0627\u062f\u0642\u0629 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0633\u0631. \u064a\u0645\u0643\u0646 \u0644\u0644\u0639\u0645\u0644\u0627\u0621 \u0627\u0644\u0633\u0631\u064a\u064a\u0646 \u0627\u0644\u0627\u062d\u062a\u0641\u0627\u0638 \u0628\u0628\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u0627\u0639\u062a\u0645\u0627\u062f \u0628\u0637\u0631\u064a\u0642\u0629 \u0622\u0645\u0646\u0629 \u062f\u0648\u0646 \u0643\u0634\u0641\u0647\u0627 \u0644\u0623\u0637\u0631\u0627\u0641 \u063a\u064a\u0631 \u0645\u0635\u0631\u062d \u0644\u0647\u0627. \u0627\u0644\u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0627\u0644\u0639\u0627\u0645\u0629 \u0645\u062b\u0644 \u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0633\u0637\u062d \u0627\u0644\u0645\u0643\u062a\u0628 \u0627\u0644\u0623\u0633\u0627\u0633\u064a\u0629 \u0623\u0648 \u062a\u0637\u0628\u064a\u0642\u0627\u062a SPA JavaScript \u063a\u064a\u0631 \u0642\u0627\u062f\u0631\u0629 \u0639\u0644\u0649 \u0627\u0644\u0627\u062d\u062a\u0641\u0627\u0638 \u0628\u0627\u0644\u0623\u0633\u0631\u0627\u0631 \u0628\u0623\u0645\u0627\u0646.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0627\u0639\u062a\u0645\u0627\u062f\u0627\u064b \u0639\u0644\u0649 \u0646\u0648\u0639 \u0627\u0644\u0645\u0639\u0627\u0645\u0644\u0629 \u0627\u0644\u062a\u064a \u062a\u0646\u0634\u0626\u0647\u0627\u060c \u0642\u062f \u064a\u062a\u0645 \u062a\u062c\u0627\u0648\u0632 \u062d\u0633\u0627\u0628 \u0627\u0644\u0645\u0635\u062f\u0631 \u0648\/\u0623\u0648 \u0627\u0644\u0648\u062c\u0647\u0629 \u0641\u064a \u0627\u0644\u062a\u0642\u0633\u064a\u0645\u0627\u062a \u0627\u0644\u0644\u0627\u062d\u0642\u0629 \u0628\u0645\u0627 \u0647\u0648 \u0645\u062d\u062f\u062f \u0641\u064a \u0623\u0648\u0644 \u062a\u0642\u0633\u064a\u0645 \u0644\u0644\u0645\u0639\u0627\u0645\u0644\u0629.",
         "multi_account_warning_withdrawal": "\u0636\u0639 \u0641\u064a \u0627\u0639\u062a\u0628\u0627\u0631\u0643 \u0623\u0646 \u062d\u0633\u0627\u0628 \u0627\u0644\u0645\u0635\u062f\u0631 \u0641\u064a \u0627\u0644\u062a\u0642\u0633\u064a\u0645\u0627\u062a \u0627\u0644\u0644\u0627\u062d\u0642\u0629 \u0633\u064a\u062a\u0645 \u062a\u062c\u0627\u0648\u0632\u0647 \u0628\u0645\u0627 \u0647\u0648 \u0645\u062d\u062f\u062f \u0641\u064a \u0623\u0648\u0644 \u062a\u0642\u0633\u064a\u0645 \u0644\u0644\u0633\u062d\u0628.",
         "multi_account_warning_deposit": "\u0636\u0639 \u0641\u064a \u0627\u0639\u062a\u0628\u0627\u0631\u0643 \u0623\u0646 \u062d\u0633\u0627\u0628 \u0627\u0644\u0648\u062c\u0647\u0629 \u0641\u064a \u0627\u0644\u062a\u0642\u0633\u064a\u0645\u0627\u062a \u0627\u0644\u0644\u0627\u062d\u0642\u0629 \u0633\u064a\u062a\u0645 \u062a\u062c\u0627\u0648\u0632\u0647 \u0628\u0645\u0627 \u0647\u0648 \u0645\u062d\u062f\u062f \u0641\u064a \u0623\u0648\u0644 \u062a\u0642\u0633\u064a\u0645 \u0644\u0644\u0625\u064a\u062f\u0627\u0639.",

resources/assets/v1/src/locales/bg.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u0422\u0430\u0439\u043d\u0430 \u043d\u0430 \u043a\u043b\u0438\u0435\u043d\u0442\u0430",
         "profile_oauth_client_secret_expl": "\u0422\u043e\u0432\u0430 \u0435 \u043d\u043e\u0432\u0430\u0442\u0430 \u0432\u0438 \"\u0442\u0430\u0439\u043d\u0430 \u043d\u0430 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\". \u0422\u043e\u0432\u0430 \u0435 \u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u0438\u044f\u0442 \u043f\u044a\u0442, \u043a\u043e\u0433\u0430\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u043a\u0430\u0437\u0430\u043d\u0430, \u0442\u0430\u043a\u0430 \u0447\u0435 \u043d\u0435 \u0433\u043e \u0433\u0443\u0431\u0435\u0442\u0435! \u0412\u0435\u0447\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 \u0442\u043e\u0437\u0438 \u043c\u0430\u0440\u043a\u0435\u0440, \u0437\u0430 \u0434\u0430 \u043e\u0442\u043f\u0440\u0430\u0432\u044f\u0442\u0435 \u0437\u0430\u044f\u0432\u043a\u0438 \u043a\u044a\u043c API.",
         "profile_oauth_confidential": "\u041f\u043e\u0432\u0435\u0440\u0438\u0442\u0435\u043b\u043d\u043e",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0412 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442 \u043e\u0442 \u0432\u0438\u0434\u0430 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430 \u043a\u043e\u044f\u0442\u043e \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u0442\u0435, \u0438\u0437\u0442\u043e\u0447\u043d\u0438\u043a\u044a\u0442 \u0438 \/ \u0438\u043b\u0438 \u0446\u0435\u043b\u0435\u0432\u0430\u0442\u0430 \u0441\u043c\u0435\u0442\u043a\u0430 \u043d\u0430 \u0441\u043b\u0435\u0434\u0432\u0430\u0449\u0438\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0438\u044f \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u0435\u043d\u0430 \u043e\u0442 \u0442\u043e\u0432\u0430 \u043a\u043e\u0435\u0442\u043e \u0435 \u0434\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d\u043e \u0432 \u043f\u044a\u0440\u0432\u043e\u0442\u043e \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f\u0442\u0430.",
         "multi_account_warning_withdrawal": "\u0418\u043c\u0430\u0439\u0442\u0435 \u043f\u0440\u0435\u0434\u0432\u0438\u0434, \u0447\u0435 \u0440\u0430\u0437\u0445\u043e\u0434\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430 \u043d\u0430 \u0441\u043b\u0435\u0434\u0432\u0430\u0449\u0438\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0438\u044f \u0449\u0435 \u0431\u044a\u0434\u0435 \u0442\u0430\u0437\u0438 \u043a\u043e\u044f\u0442\u043e \u0435 \u0434\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d\u0430 \u0432 \u043f\u044a\u0440\u0432\u0438\u044f \u0440\u0430\u0437\u0434\u0435\u043b \u043d\u0430 \u0442\u0435\u0433\u043b\u0435\u043d\u0435\u0442\u043e.",
         "multi_account_warning_deposit": "\u0418\u043c\u0430\u0439\u0442\u0435 \u043f\u0440\u0435\u0434\u0432\u0438\u0434, \u0447\u0435 \u043f\u0440\u0438\u0445\u043e\u0434\u043d\u0430\u0442\u0430 \u0441\u043c\u0435\u0442\u043a\u0430 \u043d\u0430 \u0441\u043b\u0435\u0434\u0432\u0430\u0449\u0438\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0438\u044f \u0449\u0435 \u0431\u044a\u0434\u0435 \u0442\u0430\u0437\u0438 \u043a\u043e\u044f\u0442\u043e \u0435 \u0434\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d\u0430 \u0432 \u043f\u044a\u0440\u0432\u0438\u044f \u0440\u0430\u0437\u0434\u0435\u043b \u043d\u0430 \u0434\u0435\u043f\u043e\u0437\u0438\u0442\u0430.",

resources/assets/v1/src/locales/ca.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Secret del client",
         "profile_oauth_client_secret_expl": "Aquest \u00e9s el teu nou secret de client. \u00c9s l'\u00fanic cop que es mostrar\u00e0, aix\u00ed que no el perdis! Ara ja pots utilitzar aquest secret per fer crides a l'API.",
         "profile_oauth_confidential": "Confidencial",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depenent del tipus de transacci\u00f3 que cre\u00efs, el compte d'origen i\/o el de dest\u00ed de divisions posteriors pot ser anul\u00b7lada pel que es defineix en la primera divisi\u00f3 de la transacci\u00f3.",
         "multi_account_warning_withdrawal": "Tingues en compte que el compte d'origen de divisions posteriors ser\u00e0 anul\u00b7lat pel que es troba definit a la primera divisi\u00f3 de la retirada.",
         "multi_account_warning_deposit": "Tingues en compte que el compte de dest\u00ed de divisions posteriors ser\u00e0 anul\u00b7lat pel que es troba definit a la primera divisi\u00f3 del dip\u00f2sit.",

resources/assets/v1/src/locales/cs.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Soukrom\u00e1 aplikace",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Zdrojov\u00fd \u00fa\u010det cel\u00e9 transakce je ovl\u00e1dan\u00fd prvn\u00edm rozd\u011blen\u00edm.",
         "multi_account_warning_deposit": "C\u00edlov\u00fd \u00fa\u010del v\u0161ech n\u00e1sleduj\u00edc\u00edch rozd\u011blen\u00ed je ovl\u00e1dan\u00fd c\u00edlov\u00fdm \u00fa\u010dtem prvn\u00edho rozd\u011blen\u00ed transakce.",

resources/assets/v1/src/locales/da.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Klient Hemmelighed",
         "profile_oauth_client_secret_expl": "Her er din nye klient hemmelighed. Dette er den eneste tid, den vil blive vist, s\u00e5 mist det ikke! Du kan nu bruge denne hemmelighed til at lave API-anmodninger.",
         "profile_oauth_confidential": "Fortroligt",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Afh\u00e6ngigt af hvilken type transaktion du opretter kan kilden og\/eller destinationskontoen for efterf\u00f8lgende opsplitninger tilsides\u00e6ttes, uanset hvad der er defineret i den f\u00f8rste opdeling af transaktionen.",
         "multi_account_warning_withdrawal": "Husk, at kildekontoen for efterf\u00f8lgende opdelinger vil blive overstyret af hvad der er defineret i den f\u00f8rste opdeling af tilbagetr\u00e6kningen.",
         "multi_account_warning_deposit": "Husk, at destinationskontoen for efterf\u00f8lgende opdelinger vil blive tilsidesat af hvad der er defineret i den f\u00f8rste opsplitning af depositummet.",

resources/assets/v1/src/locales/de.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Hier ist Ihr neuer pers\u00f6nlicher Zugangsschl\u00fcssel. Dies ist das einzige Mal, dass er angezeigt wird, also verlieren Sie ihn nicht! Sie k\u00f6nnen diesen Token jetzt verwenden, um API-Anfragen zu stellen.",
         "profile_oauth_confidential": "Vertraulich",
-        "profile_oauth_confidential_help": "Verlangen Sie vom Client, sich mit einem Geheimnis zu authentifizieren. Vertrauliche Clients k\u00f6nnen Anmeldedaten auf sichere Weise speichern, ohne sie Unbefugten zug\u00e4nglich zu machen. \u00d6ffentliche Anwendungen, wie prim\u00e4re Desktop- oder JavaScript-SPA-Anwendungen, sind nicht f\u00e4hig, Geheimnisse sicher zu speichern.",
+        "profile_oauth_confidential_help": "Verlangen Sie vom Client, sich mit einem Geheimnis zu authentifizieren. Vertrauliche Clients k\u00f6nnen Anmeldedaten auf sichere Weise speichern, ohne sie Unbefugten zug\u00e4nglich zu machen. \u00d6ffentliche Anwendungen, wie native Desktop- oder JavaScript-SPA-Anwendungen, sind nicht f\u00e4hig, Geheimnisse sicher zu speichern.",
         "multi_account_warning_unknown": "Abh\u00e4ngig von der Art der Buchung, die Sie anlegen, kann das Quell- und\/oder Zielkonto nachfolgender Aufteilungen durch das \u00fcberschrieben werden, was in der ersten Aufteilung der Buchung definiert wurde.",
         "multi_account_warning_withdrawal": "Bedenken Sie, dass das Quellkonto nachfolgender Aufteilungen von dem, was in der ersten Aufteilung der Abhebung definiert ist, au\u00dfer Kraft gesetzt wird.",
         "multi_account_warning_deposit": "Bedenken Sie, dass das Zielkonto nachfolgender Aufteilungen von dem, was in der ersten Aufteilung der Einnahmen definiert ist, au\u00dfer Kraft gesetzt wird.",

resources/assets/v1/src/locales/el.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u039c\u03c5\u03c3\u03c4\u03b9\u03ba\u03cc \u03a0\u03b5\u03bb\u03ac\u03c4\u03b7",
         "profile_oauth_client_secret_expl": "\u0395\u03b4\u03ce \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03bf \u03bd\u03ad\u03bf \u03c3\u03b1\u03c2 \u03bc\u03c5\u03c3\u03c4\u03b9\u03ba\u03cc \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7. \u0391\u03c5\u03c4\u03ae \u03b5\u03af\u03bd\u03b1\u03b9 \u03b7 \u03bc\u03cc\u03bd\u03b7 \u03c6\u03bf\u03c1\u03ac \u03c0\u03bf\u03c5 \u03b8\u03b1 \u03c3\u03b1\u03c2 \u03b5\u03bc\u03c6\u03b1\u03bd\u03b9\u03c3\u03c4\u03b5\u03af, \u03bf\u03c0\u03cc\u03c4\u03b5 \u03bc\u03b7\u03bd \u03c4\u03bf \u03c7\u03ac\u03c3\u03b5\u03c4\u03b5! \u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03bf \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5 \u03b1\u03b9\u03c4\u03ae\u03bc\u03b1\u03c4\u03b1 API.",
         "profile_oauth_confidential": "\u0395\u03bc\u03c0\u03b9\u03c3\u03c4\u03b5\u03c5\u03c4\u03b9\u03ba\u03cc",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0391\u03bd\u03ac\u03bb\u03bf\u03b3\u03b1 \u03bc\u03b5 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c4\u03b7\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03c0\u03bf\u03c5 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b5\u03af\u03c4\u03b5, \u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2 \u03ae\/\u03ba\u03b1\u03b9 \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd \u03c4\u03c9\u03bd \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03c9\u03bd \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03ce\u03bd \u03b5\u03bd\u03b4\u03ad\u03c7\u03b5\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bc\u03c6\u03b8\u03b5\u03af \u03b1\u03c0\u03cc \u03b1\u03c5\u03c4\u03cc \u03c0\u03bf\u03c5 \u03bf\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03c3\u03c4\u03bf \u03c0\u03c1\u03ce\u03c4\u03bf \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc \u03c4\u03b7\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2.",
         "multi_account_warning_withdrawal": "\u039b\u03ac\u03b2\u03b5\u03c4\u03b5 \u03c5\u03c0\u03cc\u03c8\u03b7 \u03cc\u03c4\u03b9 \u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2 \u03c4\u03c9\u03bd \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03c9\u03bd \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03ce\u03bd \u03b8\u03b1 \u03c5\u03c0\u03b5\u03c1\u03b9\u03c3\u03c7\u03cd\u03c3\u03b5\u03b9 \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 \u03c0\u03c1\u03ce\u03c4\u03bf\u03c5 \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd \u03c4\u03b7\u03c2 \u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2.",
         "multi_account_warning_deposit": "\u039b\u03ac\u03b2\u03b5\u03c4\u03b5 \u03c5\u03c0\u03cc\u03c8\u03b7 \u03cc\u03c4\u03b9 \u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd \u03c4\u03c9\u03bd \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03c9\u03bd \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03ce\u03bd \u03b8\u03b1 \u03c5\u03c0\u03b5\u03c1\u03b9\u03c3\u03c7\u03cd\u03c3\u03b5\u03b9 \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 \u03c0\u03c1\u03ce\u03c4\u03bf\u03c5 \u03b4\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd \u03c4\u03b7\u03c2 \u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2.",

resources/assets/v1/src/locales/en-gb.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Confidential",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/en.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Confidential",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/es.json

@@ -4,7 +4,7 @@
         "administrations_index_menu": "Administraciones financieras",
         "expires_at": "Expira el",
         "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
+        "administration_currency_form_help": "Puede tomar m\u00e1s tiempo para que la p\u00e1gina se cargue si cambia la moneda principal, porque puede que la transacci\u00f3n necesite ser convertida a su (nueva) moneda principal.",
         "administrations_page_edit_sub_title_js": "Editar administraci\u00f3n financiera \"{title}\"",
         "table": "Mesa",
         "welcome_back": "\u00bfQu\u00e9 est\u00e1 pasando?",
@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Secreto del Cliente",
         "profile_oauth_client_secret_expl": "Aqu\u00ed est\u00e1 su nuevo secreto de cliente. Esta es la \u00fanica vez que se mostrar\u00e1 as\u00ed que no lo pierda! Ahora puede usar este secreto para hacer solicitudes de API.",
         "profile_oauth_confidential": "Confidencial",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Dependiendo del tipo de transacci\u00f3n que cree, la cuenta de origen y\/o destino de divisiones posteriores puede ser anulada por lo que se define en la primera divisi\u00f3n de la transacci\u00f3n.",
         "multi_account_warning_withdrawal": "Tenga en cuenta que la cuenta de origen de las divisiones posteriores ser\u00e1 anulada por lo que se defina en la primera divisi\u00f3n del gasto.",
         "multi_account_warning_deposit": "Tenga en cuenta que la cuenta de destino de las divisiones posteriores ser\u00e1 anulada por lo que se defina en la primera divisi\u00f3n del retiro.",
@@ -154,7 +154,7 @@
         "url": "URL",
         "active": "Activo",
         "interest_date": "Fecha de inter\u00e9s",
-        "administration_currency": "Primary currency",
+        "administration_currency": "Moneda Principal",
         "title": "T\u00edtulo",
         "date": "Fecha",
         "book_date": "Fecha de registro",
@@ -174,7 +174,7 @@
     "list": {
         "title": "T\u00edtulo",
         "active": "\u00bfEst\u00e1 Activo?",
-        "primary_currency": "Primary currency",
+        "primary_currency": "Moneda principal",
         "trigger": "Disparador",
         "response": "Respuesta",
         "delivery": "Entrega",

resources/assets/v1/src/locales/fa.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u0631\u0627\u0632 \u0645\u0634\u062a\u0631\u06cc",
         "profile_oauth_client_secret_expl": "\u062f\u0631 \u0627\u06cc\u0646\u062c\u0627 \u0631\u0627\u0632 \u0645\u0634\u062a\u0631\u06cc \u062c\u062f\u06cc\u062f \u0634\u0645\u0627 \u0648\u062c\u0648\u062f \u062f\u0627\u0631\u062f. \u0627\u06cc\u0646 \u062a\u0646\u0647\u0627 \u0628\u0627\u0631\u06cc \u0627\u0633\u062a \u06a9\u0647 \u0646\u0645\u0627\u06cc\u0634 \u062f\u0627\u062f\u0647 \u062e\u0648\u0627\u0647\u062f \u0634\u062f\u060c \u067e\u0633 \u0622\u0646 \u0631\u0627 \u0627\u0632 \u062f\u0633\u062a \u0646\u062f\u0647\u06cc\u062f! \u0627\u06a9\u0646\u0648\u0646 \u0645\u06cc \u062a\u0648\u0627\u0646\u06cc\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0631\u0627\u0632 \u0628\u0631\u0627\u06cc \u0627\u06cc\u062c\u0627\u062f \u062f\u0631\u062e\u0648\u0627\u0633\u062a \u0647\u0627\u06cc API \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.\n",
         "profile_oauth_confidential": "\u0645\u062d\u0631\u0645\u0627\u0646\u0647",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0628\u0633\u062a\u0647 \u0628\u0647 \u0646\u0648\u0639 \u062a\u0631\u0627\u06a9\u0646\u0634\u06cc \u06a9\u0647 \u0627\u06cc\u062c\u0627\u062f \u0645\u06cc\u200c\u06a9\u0646\u06cc\u062f\u060c \u062d\u0633\u0627\u0628 \u0645\u0646\u0628\u0639 \u0648\/\u06cc\u0627 \u0645\u0642\u0635\u062f \u062a\u0642\u0633\u06cc\u0645\u200c\u0647\u0627\u06cc \u0628\u0639\u062f\u06cc \u0645\u0645\u06a9\u0646 \u0627\u0633\u062a \u0628\u0627 \u0647\u0631 \u0622\u0646\u0686\u0647 \u062f\u0631 \u062a\u0642\u0633\u06cc\u0645 \u0627\u0648\u0644 \u062a\u0631\u0627\u06a9\u0646\u0634 \u062a\u0639\u0631\u06cc\u0641 \u0634\u062f\u0647 \u0627\u0633\u062a \u0644\u063a\u0648 \u0634\u0648\u062f.\n",
         "multi_account_warning_withdrawal": "\u0628\u0647 \u062e\u0627\u0637\u0631 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u062d\u0633\u0627\u0628 \u0645\u0646\u0628\u0639 \u0627\u0646\u0634\u0639\u0627\u0628\u0627\u062a \u0628\u0639\u062f\u06cc \u0628\u0627 \u0647\u0631 \u0622\u0646\u0686\u0647 \u062f\u0631 \u062a\u0642\u0633\u06cc\u0645 \u0627\u0648\u0644 \u0628\u0631\u062f\u0627\u0634\u062a \u062a\u0639\u0631\u06cc\u0641 \u0634\u062f\u0647 \u0627\u0633\u062a \u0644\u063a\u0648 \u0645\u06cc \u0634\u0648\u062f.\n",
         "multi_account_warning_deposit": "\u0628\u0647 \u062e\u0627\u0637\u0631 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u06cc\u062f \u06a9\u0647 \u062d\u0633\u0627\u0628 \u0645\u0642\u0635\u062f \u062a\u0642\u0633\u06cc\u0645 \u0647\u0627\u06cc \u0628\u0639\u062f\u06cc \u0628\u0627 \u0647\u0631 \u0622\u0646\u0686\u0647 \u062f\u0631 \u0627\u0648\u0644\u06cc\u0646 \u062a\u0642\u0633\u06cc\u0645 \u0633\u067e\u0631\u062f\u0647 \u062a\u0639\u0631\u06cc\u0641 \u0634\u062f\u0647 \u0627\u0633\u062a \u0644\u063a\u0648 \u0645\u06cc \u0634\u0648\u062f.\n",

resources/assets/v1/src/locales/fi.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Asiakkaan salausavain (Client secret)",
         "profile_oauth_client_secret_expl": "T\u00e4ss\u00e4 on uusi asiakkaan salausavaimesi. T\u00e4m\u00e4 on ainoa kerta kun se n\u00e4ytet\u00e4\u00e4n, joten \u00e4l\u00e4 hukkaa sit\u00e4! Voit nyt k\u00e4ytt\u00e4\u00e4 t\u00e4t\u00e4 avainta tehd\u00e4ksesi API komentoja.",
         "profile_oauth_confidential": "Luottamuksellinen",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Riippuen luomasi tapahtuman tyypist\u00e4, my\u00f6hempien jaotteluiden l\u00e4hde- ja\/tai kohdetilin tyyppi voidaan kumota sen mukaan, mit\u00e4 on m\u00e4\u00e4ritelty tapahtuman ensimm\u00e4isess\u00e4 jaossa.",
         "multi_account_warning_withdrawal": "Muista, ett\u00e4 my\u00f6hempien jakojen l\u00e4hdetili m\u00e4\u00e4r\u00e4ytyy noston ensimm\u00e4isen jaon m\u00e4\u00e4ritysten mukaan.",
         "multi_account_warning_deposit": "Muista, ett\u00e4 my\u00f6hempien jakojen kohdetili m\u00e4\u00e4r\u00e4ytyy talletuksen ensimm\u00e4isen jaon m\u00e4\u00e4ritysten mukaan.",

resources/assets/v1/src/locales/fr.json

@@ -3,8 +3,8 @@
         "administrations_page_title": "Administrations financi\u00e8res",
         "administrations_index_menu": "Administrations financi\u00e8res",
         "expires_at": "Expire le",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
+        "temp_administrations_introduction": "Firefly III aura bient\u00f4t la possibilit\u00e9 de g\u00e9rer plusieurs administrations financi\u00e8res. Pour le moment, vous n'en avez qu'une. Vous pouvez d\u00e9finir le titre de cette administration et de sa devise principale. Cela remplace le param\u00e8tre pr\u00e9c\u00e9dent o\u00f9 vous d\u00e9finissiez votre \"devise par d\u00e9faut\". Ce param\u00e8tre est d\u00e9sormais li\u00e9 \u00e0 l'administration financi\u00e8re et peut \u00eatre diff\u00e9rent par administration.",
+        "administration_currency_form_help": "La page peut mettre longtemps \u00e0 charger si vous modifiez la devise principale, car des op\u00e9rations peuvent n\u00e9cessiter une conversion vers votre (nouvelle) devise principale.",
         "administrations_page_edit_sub_title_js": "Modifier l'administration financi\u00e8re \"{title}\"",
         "table": "Tableau",
         "welcome_back": "Quoi de neuf ?",
@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Secret du client",
         "profile_oauth_client_secret_expl": "Voici votre nouveau secret de client. C'est la seule fois qu'il sera affich\u00e9, donc ne le perdez pas ! Vous pouvez maintenant utiliser ce secret pour faire des requ\u00eates d'API.",
         "profile_oauth_confidential": "Confidentiel",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Selon le type d'op\u00e9ration que vous cr\u00e9ez, le(s) compte(s) source et\/ou de destination des s\u00e9parations suivantes peuvent \u00eatre remplac\u00e9s par celui de la premi\u00e8re s\u00e9paration de l'op\u00e9ration.",
         "multi_account_warning_withdrawal": "Gardez en t\u00eate que le compte source des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration de la d\u00e9pense.",
         "multi_account_warning_deposit": "Gardez en t\u00eate que le compte de destination des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration du d\u00e9p\u00f4t.",
@@ -154,7 +154,7 @@
         "url": "Liens",
         "active": "Actif",
         "interest_date": "Date de valeur (int\u00e9r\u00eats)",
-        "administration_currency": "Primary currency",
+        "administration_currency": "Devise principale",
         "title": "Titre",
         "date": "Date",
         "book_date": "Date d'enregistrement",
@@ -174,7 +174,7 @@
     "list": {
         "title": "Titre",
         "active": "Actif ?",
-        "primary_currency": "Primary currency",
+        "primary_currency": "Devise principale",
         "trigger": "D\u00e9clencheur",
         "response": "R\u00e9ponse",
         "delivery": "Distribution",

resources/assets/v1/src/locales/hu.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Kliens titkos k\u00f3dja",
         "profile_oauth_client_secret_expl": "Ez a kliens titkos k\u00f3dja. Ez az egyetlen alkalom, amikor meg van jelen\u00edtve, ne hagyd el! Ezzel a k\u00f3ddal v\u00e9gezhetsz API h\u00edv\u00e1sokat.",
         "profile_oauth_confidential": "Bizalmas",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/id.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Confidential",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/it.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Segreto del client",
         "profile_oauth_client_secret_expl": "Ecco il segreto del nuovo client. Questa \u00e8 l'unica occasione in cui viene mostrato pertanto non perderlo! Ora puoi usare questo segreto per effettuare delle richieste alle API.",
         "profile_oauth_confidential": "Riservato",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "A seconda del tipo di transazione che hai creato, il conto di origine e\/o destinazione delle successive suddivisioni pu\u00f2 essere sovrascritto da qualsiasi cosa sia definita nella prima suddivisione della transazione.",
         "multi_account_warning_withdrawal": "Ricorda che il conto di origine delle successive suddivisioni verr\u00e0 sovrascritto da quello definito nella prima suddivisione del prelievo.",
         "multi_account_warning_deposit": "Ricorda che il conto di destinazione delle successive suddivisioni verr\u00e0 sovrascritto da quello definito nella prima suddivisione del deposito.",

resources/assets/v1/src/locales/ja.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30b7\u30fc\u30af\u30ec\u30c3\u30c8",
         "profile_oauth_client_secret_expl": "\u65b0\u3057\u3044\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3067\u3059\u3002 \u3053\u308c\u306f\u4e00\u5ea6\u3057\u304b\u8868\u793a\u3055\u308c\u306a\u3044\u306e\u3067\u3001\u5931\u304f\u3055\u306a\u3044\u3067\u304f\u3060\u3055\u3044\uff01\u3053\u306e\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u306b\u3088\u308a API \u30ea\u30af\u30a8\u30b9\u30c8\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002",
         "profile_oauth_confidential": "\u6a5f\u5bc6",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u4f5c\u6210\u3059\u308b\u53d6\u5f15\u306e\u7a2e\u985e\u306b\u5fdc\u3058\u3066\u3001\u7d9a\u304f\u5206\u5272\u306e\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u3084\u9810\u3051\u5165\u308c\u53e3\u5ea7\u306f\u3001\u53d6\u5f15\u306e\u6700\u521d\u306e\u5206\u5272\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u3082\u306e\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002",
         "multi_account_warning_withdrawal": "\u7d9a\u304f\u5206\u5272\u306e\u5f15\u304d\u51fa\u3057\u53e3\u5ea7\u306f\u3001\u51fa\u91d1\u306e\u6700\u521d\u306e\u5206\u5272\u306e\u5b9a\u7fa9\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002",
         "multi_account_warning_deposit": "\u7d9a\u304f\u5206\u5272\u306e\u9810\u3051\u5165\u308c\u53e3\u5ea7\u306f\u3001\u9001\u91d1\u306e\u6700\u521d\u306e\u5206\u5272\u306e\u5b9a\u7fa9\u306b\u3088\u3063\u3066\u8986\u3055\u308c\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002",

resources/assets/v1/src/locales/ko.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\ud074\ub77c\uc774\uc5b8\ud2b8 \uc2dc\ud06c\ub9bf",
         "profile_oauth_client_secret_expl": "\ub2e4\uc74c\uc740 \uc0c8 \ud074\ub77c\uc774\uc5b8\ud2b8 \uc554\ud638\uc785\ub2c8\ub2e4. \uc774\ubc88 \ud55c \ubc88\ub9cc \ud45c\uc2dc\ub418\ub2c8 \ub193\uce58\uc9c0 \ub9c8\uc138\uc694! \uc774\uc81c \uc774 \ube44\ubc00 \ubc88\ud638\ub97c \uc0ac\uc6a9\ud558\uc5ec API \uc694\uccad\uc744 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
         "profile_oauth_confidential": "\ube44\ubc00",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\uc0dd\uc131\ud55c \uac70\ub798 \uc720\ud615\uc5d0 \ub530\ub77c \ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \uc18c\uc2a4 \ubc0f\/\ub610\ub294 \ub300\uc0c1 \uacc4\uc815\uc740 \ub300\uc0c1 \uacc4\uc815 \uac70\ub798\uc758 \uccab \ubc88\uc9f8 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \ubb34\uc2dc\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
         "multi_account_warning_withdrawal": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \uc18c\uc2a4 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \ucd9c\uae08 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",
         "multi_account_warning_deposit": "\ub4a4\ub530\ub974\ub294 \ubd84\ud560\uc758 \ub300\uc0c1 \uacc4\uc815\uc740 \uccab \ubc88\uc9f8 \uc785\uae08 \ubd84\ud560\uc5d0 \uc815\uc758\ub41c \ub0b4\uc6a9\uc5d0 \ub530\ub77c \uc7ac\uc815\uc758\ub41c\ub2e4\ub294 \uc810\uc5d0 \uc720\uc758\ud558\uc2dc\uae30 \ubc14\ub78d\ub2c8\ub2e4.",

resources/assets/v1/src/locales/nb.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Klient hemmilghet",
         "profile_oauth_client_secret_expl": "Her er din nye klient hemmelighet. Dette er den eneste tiden det blir vist s\u00e5 ikke mister den! Du kan n\u00e5 bruke denne hemmeligheten til \u00e5 lage API-foresp\u00f8rsler.",
         "profile_oauth_confidential": "Konfidensiell",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Avhengig av hvilken type transaksjon du oppretter, Kilden og\/eller destinasjonskonto for etterf\u00f8lgende delinger kan overstyres av det som er definert i transaksjonens f\u00f8rste del.",
         "multi_account_warning_withdrawal": "Husk at kildekontoen for etterf\u00f8lgende oppsplitting skal overlates av hva som defineres i den f\u00f8rste delen av uttrekket.",
         "multi_account_warning_deposit": "Husk at mottakerkontoen for etterf\u00f8lgende oppsplitting skal overstyres av det som er definert i den f\u00f8rste delen av depositumet.",

resources/assets/v1/src/locales/nl.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client secret",
         "profile_oauth_client_secret_expl": "Hier is je nieuwe client secret. Dit is de enige keer dat deze getoond wordt dus verlies deze niet! Je kan dit secret gebruiken om API-aanvragen te maken.",
         "profile_oauth_confidential": "Vertrouwelijk",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Afhankelijk van het type transactie wordt de bron- en\/of doelrekening overschreven door wat er in de eerste split staat.",
         "multi_account_warning_withdrawal": "De bronrekening wordt overschreven door wat er in de eerste split staat.",
         "multi_account_warning_deposit": "De doelrekening wordt overschreven door wat er in de eerste split staat.",

resources/assets/v1/src/locales/nn.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Klient Hemmelegheit",
         "profile_oauth_client_secret_expl": "Her er din nye klienthemmelegheit. Dette er den einaste gongen han vert vist s\u00e5 ikkje mist han! Du kan bruka denne hemmeligheita til \u00e5 laga API-sp\u00f8rsm\u00e5l.",
         "profile_oauth_confidential": "Konfidensiell",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Avhengig av kva type transaksjon du opprettar, Kjelde og\/eller m\u00e5lkonto for etterf\u00f8lgande delingar kan overstyrast av det som er definert i transaksjonens f\u00f8rste del.",
         "multi_account_warning_withdrawal": "Husk at kildekontoen for etterf\u00f8lgende oppsplitting skal overlates av kva som defineres i den f\u00f8rste delen av uttrekket.",
         "multi_account_warning_deposit": "Husk at mottakerkontoen for etterf\u00f8lgende oppsplitting skal overstyres av det som er definert i den f\u00f8rste delen av depositumet.",

resources/assets/v1/src/locales/pl.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Sekret klienta",
         "profile_oauth_client_secret_expl": "Oto tw\u00f3j nowy sekret klienta. Jest to jedyny raz, gdy zostanie wy\u015bwietlony, wi\u0119c nie zgub go! Mo\u017cesz teraz u\u017cy\u0107 tego sekretu, aby wykona\u0107 zapytania API.",
         "profile_oauth_confidential": "Poufne",
-        "profile_oauth_confidential_help": "Wymagaj od klienta uwierzytelnienia za pomoc\u0105 sekretu. Poufni klienci mog\u0105 przechowywa\u0107 po\u015bwiadczenia w bezpieczny spos\u00f3b bez nara\u017cania ich na dost\u0119p przez nieuprawnione strony. Publiczne aplikacje, takie jak natywne aplikacje desktopowe lub JavaScript SPA, nie s\u0105 w stanie bezpiecznie trzyma\u0107 sekret\u00f3w.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "W zale\u017cno\u015bci od rodzaju transakcji, kt\u00f3r\u0105 tworzysz, konto \u017ar\u00f3d\u0142owe i\/lub docelowe kolejnych podzia\u0142\u00f3w mo\u017ce zosta\u0107 ustawione na konto zdefiniowane w pierwszym podziale transakcji.",
         "multi_account_warning_withdrawal": "Pami\u0119taj, \u017ce konto \u017ar\u00f3d\u0142owe kolejnych podzia\u0142\u00f3w zostanie ustawione na konto zdefiniowane w pierwszym podziale wyp\u0142aty.",
         "multi_account_warning_deposit": "Pami\u0119taj, \u017ce konto docelowe kolejnych podzia\u0142\u00f3w zostanie ustawione na konto zdefiniowane w pierwszym podziale wp\u0142aty.",

resources/assets/v1/src/locales/pt-br.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Segredo do cliente",
         "profile_oauth_client_secret_expl": "Aqui est\u00e1 o seu novo segredo de cliente. Esta \u00e9 a \u00fanica vez que ela ser\u00e1 mostrada, ent\u00e3o n\u00e3o o perca! Agora voc\u00ea pode usar este segredo para fazer requisi\u00e7\u00f5es de API.",
         "profile_oauth_confidential": "Confidencial",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Dependendo do tipo de transa\u00e7\u00e3o que voc\u00ea criar, a conta de origem e\/ou de destino das divis\u00f5es subsequentes pode ser sobrescrita pelo que estiver definido na primeira divis\u00e3o da transa\u00e7\u00e3o.",
         "multi_account_warning_withdrawal": "Tenha em mente que a conta de origem das divis\u00f5es subsequentes ser\u00e1 sobrescrita pelo que estiver definido na primeira divis\u00e3o da sa\u00edda.",
         "multi_account_warning_deposit": "Tenha em mente que a conta de destino das divis\u00f5es subsequentes ser\u00e1 sobrescrita pelo que estiver definido na primeira divis\u00e3o da entrada.",

resources/assets/v1/src/locales/pt.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Segredo do cliente",
         "profile_oauth_client_secret_expl": "Aqui est\u00e1 o seu segredo de cliente. Apenas estar\u00e1 vis\u00edvel uma vez, portanto n\u00e3o o perca! Pode agora utilizar este segredo para fazer pedidos \u00e0 API.",
         "profile_oauth_confidential": "Confidencial",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Dependendo do tipo de transa\u00e7\u00e3o que criar, a conta de origem e\/ou destino de subsequentes divis\u00f5es pode ser sobrescrita pelo que estiver definido na primeira divis\u00e3o da transa\u00e7\u00e3o.",
         "multi_account_warning_withdrawal": "Tenha presente que a conta de origem de divis\u00f5es subsequentes ser\u00e1 sobrescrita pelo que estiver definido na primeira divis\u00e3o do levantamento.",
         "multi_account_warning_deposit": "Tenha presente que a conta de destino de divis\u00f5es subsequentes ser\u00e1 sobrescrita pelo que estiver definida na primeira divis\u00e3o do dep\u00f3sito.",

resources/assets/v1/src/locales/ro.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Secret client",
         "profile_oauth_client_secret_expl": "Aici este noul t\u0103u cod secret de client. Este singura dat\u0103 c\u00e2nd va fi afi\u0219at a\u0219a c\u0103 nu \u00eel pierzi! Acum po\u021bi folosi acest cod pentru a face cereri API.",
         "profile_oauth_confidential": "Confiden\u0163ial",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u00cen func\u021bie de tipul de tranzac\u021bie pe care o crea\u021bi, contul sursei \u0219i\/sau destina\u021biei frac\u021bion\u0103rilor ulterioare poate fi dep\u0103\u0219it cu orice se define\u0219te \u00een prima \u00eemp\u0103r\u021bire a tranzac\u021biei.",
         "multi_account_warning_withdrawal": "Re\u0163ine\u0163i faptul c\u0103 sursa scind\u0103rilor ulterioare va fi anulat\u0103 de orice altceva definit \u00een prima \u00eemp\u0103r\u0163ire a retragerii.",
         "multi_account_warning_deposit": "\u021aine\u021bi cont de faptul c\u0103 destina\u021bia scind\u0103rilor ulterioare va fi dep\u0103\u0219it\u0103 cu orice se define\u0219te la prima \u00eemp\u0103r\u021bire a depozitului.",

resources/assets/v1/src/locales/ru.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u041a\u043b\u044e\u0447 \u043a\u043b\u0438\u0435\u043d\u0442\u0430",
         "profile_oauth_client_secret_expl": "\u0412\u043e\u0442 \u0432\u0430\u0448 \u043d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447 \u043a\u043b\u0438\u0435\u043d\u0442\u0430. \u041e\u043d \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u043a\u0430\u0437\u0430\u043d \u0432\u0430\u043c \u0442\u043e\u043b\u044c\u043a\u043e \u0441\u0435\u0439\u0447\u0430\u0441, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u043d\u0435 \u043f\u043e\u0442\u0435\u0440\u044f\u0439\u0442\u0435 \u0435\u0433\u043e! \u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u044e\u0447, \u0447\u0442\u043e\u0431\u044b \u0434\u0435\u043b\u0430\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441\u044b \u043f\u043e API.",
         "profile_oauth_confidential": "\u041a\u043e\u043d\u0444\u0438\u0434\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0439",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0412 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0442 \u0442\u0438\u043f\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438, \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u0432\u044b \u0441\u043e\u0437\u0434\u0430\u0451\u0442\u0435, \u0441\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0438\/\u0438\u043b\u0438 \u0441\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u0447\u0430\u0441\u0442\u0435\u0439 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u044b \u0442\u0435\u043c\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u0434\u043b\u044f \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438.",
         "multi_account_warning_withdrawal": "\u0418\u043c\u0435\u0439\u0442\u0435 \u0432 \u0432\u0438\u0434\u0443, \u0447\u0442\u043e \u0441\u0447\u0451\u0442-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0432 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u0430\u0441\u0442\u044f\u0445 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0431\u0443\u0434\u0435\u0442 \u0442\u0430\u043a\u0438\u043c \u0436\u0435, \u043a\u0430\u043a \u0432 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0440\u0430\u0441\u0445\u043e\u0434\u0430.",
         "multi_account_warning_deposit": "\u0418\u043c\u0435\u0439\u0442\u0435 \u0432 \u0432\u0438\u0434\u0443, \u0447\u0442\u043e \u0441\u0447\u0451\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0432 \u0434\u0440\u0443\u0433\u0438\u0445 \u0447\u0430\u0441\u0442\u044f\u0445 \u0440\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u043e\u0439 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0431\u0443\u0434\u0435\u0442 \u0442\u0430\u043a\u0438\u043c \u0436\u0435, \u043a\u0430\u043a \u0432 \u043f\u0435\u0440\u0432\u043e\u0439 \u0447\u0430\u0441\u0442\u0438 \u0434\u043e\u0445\u043e\u0434\u0430.",

resources/assets/v1/src/locales/sk.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Tajn\u00fd k\u013e\u00fa\u010d klienta",
         "profile_oauth_client_secret_expl": "Toto je v\u00e1\u0161 tajn\u00fd k\u013e\u00fa\u010d klienta. Toto je jedin\u00fd raz, kedy sa zobraz\u00ed - nestra\u0165te ho! Odteraz m\u00f4\u017eete tento tajn\u00fd k\u013e\u00fa\u010d pou\u017e\u00edva\u0165 pre pr\u00edstup k API.",
         "profile_oauth_confidential": "D\u00f4vern\u00e9",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "V z\u00e1vislosti od typu vytvorenej transakcie, m\u00f4\u017ee by\u0165 zdrojov\u00fd a\/alebo cie\u013eov\u00fd \u00fa\u010det n\u00e1sledn\u00fdch roz\u00fa\u010dtovan\u00ed prep\u00edsan\u00fd \u00fadajmi v prvom rozdelen\u00ed transakcie.",
         "multi_account_warning_withdrawal": "Majte na pam\u00e4ti, \u017ee zdrojov\u00fd bankov\u00fd \u00fa\u010det n\u00e1sledn\u00fdch roz\u00fa\u010dtovan\u00ed bude prep\u00edsan\u00fd t\u00fdm, \u010do je definovan\u00e9 v prvom rozdelen\u00ed v\u00fdberu.",
         "multi_account_warning_deposit": "Majte na pam\u00e4ti, \u017ee zdrojov\u00fd bankov\u00fd \u00fa\u010det n\u00e1sledn\u00fdch roz\u00fa\u010dtovan\u00ed bude prep\u00edsan\u00fd t\u00fdm, \u010do je definovan\u00e9 v prvom roz\u00fa\u010dtovan\u00ed vkladu.",

resources/assets/v1/src/locales/sl.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Skrivna koda odjemalca",
         "profile_oauth_client_secret_expl": "Tukaj je skrivna koda va\u0161ega odjemalca. To je edini \u010das, da bo prikazana, zato je ne izgubite! Zdaj lahko uporabite to skrivno kodo za po\u0161iljanje zahtev API.",
         "profile_oauth_confidential": "Zaupno",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Odvisno od vrste transakcije, ki jo ustvarite, lahko izvorni in\/ali ciljni ra\u010dun poznej\u0161ih razdelitev preglasi tisto, kar je definirano v prvi razdelitvi transakcije.",
         "multi_account_warning_withdrawal": "Upo\u0161tevajte, da bo izvorni ra\u010dun poznej\u0161ih razdelitev preglasilo tisto, kar je definirano v prvi razdelitvi odliva.",
         "multi_account_warning_deposit": "Upo\u0161tevajte, da bo ciljni ra\u010dun poznej\u0161ih delitev preglasilo tisto, kar je opredeljeno v prvi delitvi priliva.",

resources/assets/v1/src/locales/sv.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Klienthemlighet",
         "profile_oauth_client_secret_expl": "H\u00e4r \u00e4r din nya klient hemlighet. Detta \u00e4r den enda g\u00e5ngen det kommer att visas s\u00e5 f\u00f6rlora inte det! Du kan nu anv\u00e4nda denna hemlighet f\u00f6r att g\u00f6ra API-f\u00f6rfr\u00e5gningar.",
         "profile_oauth_confidential": "Konfidentiell",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Beroende p\u00e5 vilken typ av transaktion du skapar, k\u00e4llan och\/eller destinationskontot f\u00f6r efterf\u00f6ljande delningar kan \u00e5sidos\u00e4ttas av vad som \u00e4n definieras i den f\u00f6rsta delningen av transaktionen.",
         "multi_account_warning_withdrawal": "T\u00e4nk p\u00e5 att k\u00e4llkontot f\u00f6r efterf\u00f6ljande uppdelningar kommer att upph\u00e4vas av vad som \u00e4n definieras i den f\u00f6rsta uppdelningen av uttaget.",
         "multi_account_warning_deposit": "T\u00e4nk p\u00e5 att destinationskontot f\u00f6r efterf\u00f6ljande uppdelningar kommer att styras av vad som \u00e4n definieras i den f\u00f6rsta uppdelningen av ins\u00e4ttningen.",

resources/assets/v1/src/locales/tr.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "M\u00fc\u015fteri S\u0131rr\u0131",
         "profile_oauth_client_secret_expl": "\u0130\u015fte yeni m\u00fc\u015fteri s\u0131rr\u0131n. Bu g\u00f6sterilecek tek zaman, bu y\u00fczden onu kaybetme! Art\u0131k API istekleri yapmak i\u00e7in bu s\u0131rr\u0131 kullanabilirsiniz.",
         "profile_oauth_confidential": "Gizli",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Olu\u015fturdu\u011funuz i\u015flemin t\u00fcr\u00fcne ba\u011fl\u0131 olarak, sonraki b\u00f6l\u00fcnmelerin kaynak ve \/ veya hedef hesab\u0131, i\u015flemin ilk b\u00f6l\u00fcnmesinde tan\u0131mlanan her \u015fey taraf\u0131ndan ge\u00e7ersiz k\u0131l\u0131nabilir.",
         "multi_account_warning_withdrawal": "Sonraki b\u00f6l\u00fcnmelerin kaynak hesab\u0131n\u0131n, geri \u00e7ekilmenin ilk b\u00f6l\u00fcnmesinde tan\u0131mlanan herhangi bir \u015fey taraf\u0131ndan reddedilece\u011fini unutmay\u0131n.",
         "multi_account_warning_deposit": "Sonraki b\u00f6l\u00fcnmelerin hedef hesab\u0131n\u0131n, mevduat\u0131n ilk b\u00f6l\u00fcnmesinde tan\u0131mlanan herhangi bir \u015fey taraf\u0131ndan iptal edilece\u011fini unutmay\u0131n.",

resources/assets/v1/src/locales/uk.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u0438\u0439 \u043a\u043b\u044e\u0447 \u043a\u043b\u0456\u0454\u043d\u0442\u0430",
         "profile_oauth_client_secret_expl": "\u041e\u0441\u044c \u043d\u043e\u0432\u0438\u0439 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u0438\u0439 \u043a\u043b\u044e\u0447 \u043a\u043b\u0456\u0454\u043d\u0442\u0430. \u0426\u0435 \u0454\u0434\u0438\u043d\u0438\u0439 \u0440\u0430\u0437, \u043a\u043e\u043b\u0438 \u0432\u0456\u043d \u0431\u0443\u0434\u0435 \u043f\u043e\u043a\u0430\u0437\u0430\u043d\u0438\u0439, \u0442\u043e\u043c\u0443 \u043d\u0435 \u0432\u0442\u0440\u0430\u0447\u0430\u0439\u0442\u0435 \u0439\u043e\u0433\u043e! \u0422\u0435\u043f\u0435\u0440 \u0432\u0438 \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0446\u0435\u0439 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u0438\u0439 \u043a\u043b\u044e\u0447 \u0434\u043b\u044f \u043d\u0430\u0434\u0441\u0438\u043b\u0430\u043d\u043d\u044f \u0437\u0430\u043f\u0438\u0442\u0456\u0432 API.",
         "profile_oauth_confidential": "\u041a\u043e\u043d\u0444\u0456\u0434\u0435\u043d\u0446\u0456\u0439\u043d\u043e",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u0417\u0430\u043b\u0435\u0436\u043d\u043e \u0432\u0456\u0434 \u0442\u0438\u043f\u0443 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457, \u044f\u043a\u0443 \u0432\u0438 \u0441\u0442\u0432\u043e\u0440\u044e\u0454\u0442\u0435, \u0432\u0438\u0445\u0456\u0434\u043d\u0438\u043c \u0456\/\u0430\u0431\u043e \u0446\u0456\u043b\u044c\u043e\u0432\u0438\u043c \u0440\u0430\u0445\u0443\u043d\u043a\u043e\u043c \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0445 \u043f\u043e\u0434\u0456\u043b\u0456\u0432 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 \u0440\u0430\u0445\u0443\u043d\u043e\u043a, \u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0443 \u043f\u0435\u0440\u0448\u043e\u043c\u0443 \u043f\u043e\u0434\u0456\u043b\u0456 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u0457.",
         "multi_account_warning_withdrawal": "\u0417\u0430\u0443\u0432\u0430\u0436\u0442\u0435, \u0449\u043e \u0432\u0438\u0445\u0456\u0434\u043d\u0438\u043c \u0440\u0430\u0445\u0443\u043d\u043a\u043e\u043c \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0445 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0456\u0432 \u0431\u0443\u0434\u0435 \u0432\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u0440\u0430\u0445\u0443\u043d\u043e\u043a, \u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0443 \u043f\u0435\u0440\u0448\u043e\u043c\u0443 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0456 \u0432\u0438\u043f\u043b\u0430\u0442.",
         "multi_account_warning_deposit": "\u0417\u0430\u0443\u0432\u0430\u0436\u0442\u0435, \u0449\u043e \u0446\u0456\u043b\u044c\u043e\u0432\u0438\u043c \u0440\u0430\u0445\u0443\u043d\u043a\u043e\u043c \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0445 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0456\u0432 \u0431\u0443\u0434\u0435 \u0432\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u0440\u0430\u0445\u0443\u043d\u043e\u043a, \u0432\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0443 \u043f\u0435\u0440\u0448\u043e\u043c\u0443 \u0440\u043e\u0437\u043f\u043e\u0434\u0456\u043b\u0456 \u0434\u0435\u043f\u043e\u0437\u0438\u0442\u0443.",

resources/assets/v1/src/locales/vi.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Client Secret",
         "profile_oauth_client_secret_expl": "Here is your new client secret. This is the only time it will be shown so don't lose it! You may now use this secret to make API requests.",
         "profile_oauth_confidential": "Confidential",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "Depending on the type of transaction you create, the source and\/or destination account of subsequent splits may be overruled by whatever is defined in the first split of the transaction.",
         "multi_account_warning_withdrawal": "Keep in mind that the source account of subsequent splits will be overruled by whatever is defined in the first split of the withdrawal.",
         "multi_account_warning_deposit": "Keep in mind that the destination account of subsequent splits will be overruled by whatever is defined in the first split of the deposit.",

resources/assets/v1/src/locales/zh-cn.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u5ba2\u6237\u7aef\u5bc6\u94a5",
         "profile_oauth_client_secret_expl": "\u8bf7\u59a5\u5584\u4fdd\u5b58\u60a8\u7684\u65b0\u5ba2\u6237\u7aef\u7684\u5bc6\u94a5\uff0c\u6b64\u5bc6\u94a5\u4ec5\u4f1a\u5728\u8fd9\u91cc\u5c55\u793a\u4e00\u6b21\u3002\u60a8\u73b0\u5728\u5df2\u53ef\u4ee5\u4f7f\u7528\u6b64\u5bc6\u94a5\u8fdb\u884c API \u8bf7\u6c42\u3002",
         "profile_oauth_confidential": "\u4f7f\u7528\u52a0\u5bc6",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u6839\u636e\u60a8\u521b\u5efa\u7684\u4ea4\u6613\u7c7b\u578b\uff0c\u540e\u7eed\u62c6\u5206\u7684\u6765\u6e90\u548c\/\u6216\u76ee\u6807\u8d26\u6237\u53ef\u80fd\u88ab\u4ea4\u6613\u7684\u9996\u7b14\u62c6\u5206\u7684\u914d\u7f6e\u6240\u8986\u76d6\u3002",
         "multi_account_warning_withdrawal": "\u8bf7\u6ce8\u610f\uff0c\u540e\u7eed\u62c6\u5206\u7684\u6765\u6e90\u8d26\u6237\u5c06\u4f1a\u88ab\u652f\u51fa\u7684\u9996\u7b14\u62c6\u5206\u7684\u914d\u7f6e\u6240\u8986\u76d6\u3002",
         "multi_account_warning_deposit": "\u8bf7\u6ce8\u610f\uff0c\u540e\u7eed\u62c6\u5206\u7684\u76ee\u6807\u8d26\u6237\u5c06\u4f1a\u88ab\u6536\u5165\u7684\u9996\u7b14\u62c6\u5206\u7684\u914d\u7f6e\u6240\u8986\u76d6\u3002",

resources/assets/v1/src/locales/zh-tw.json

@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "\u7528\u6236\u7aef\u7955\u5bc6",
         "profile_oauth_client_secret_expl": "\u4ee5\u4e0b\u70ba\u60a8\u65b0\u7684\u7528\u6236\u7aef\u7955\u5bc6\u3002\u6b64\u7955\u5bc6\u53ea\u6703\u986f\u793a\u4e00\u6b21\uff0c\u8acb\u8b39\u614e\u4fdd\u5b58\uff01\u60a8\u73fe\u5728\u53ef\u4f7f\u7528\u6b64\u7955\u5bc6\u4f86\u767c\u9001 API \u8acb\u6c42\u3002",
         "profile_oauth_confidential": "\u6a5f\u5bc6 (Confidential)",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.",
         "multi_account_warning_unknown": "\u4f9d\u60a8\u5efa\u7acb\u4ea4\u6613\u7684\u985e\u578b\u4e0d\u540c\uff0c\u5f8c\u7e8c\u62c6\u5206\u7684\u4f86\u6e90\u5e33\u6236\u6216\u76ee\u6a19\u5e33\u6236\u53ef\u80fd\u6703\u88ab\u7b2c\u4e00\u7b46\u62c6\u5206\u4e2d\u8a2d\u5b9a\u7684\u5e33\u6236\u8986\u5beb\u3002",
         "multi_account_warning_withdrawal": "\u8acb\u6ce8\u610f\uff0c\u82e5\u60a8\u5efa\u7acb\u7684\u662f\u63d0\u6b3e\u4ea4\u6613\uff0c\u5f8c\u7e8c\u62c6\u5206\u7684\u4f86\u6e90\u5e33\u6236\u5c07\u6703\u88ab\u7b2c\u4e00\u7b46\u62c6\u5206\u4e2d\u8a2d\u5b9a\u7684\u5e33\u6236\u8986\u5beb\u3002",
         "multi_account_warning_deposit": "\u8acb\u6ce8\u610f\uff0c\u82e5\u60a8\u5efa\u7acb\u7684\u662f\u5b58\u6b3e\u4ea4\u6613\uff0c\u5f8c\u7e8c\u62c6\u5206\u7684\u76ee\u6a19\u5e33\u6236\u5c07\u6703\u88ab\u7b2c\u4e00\u7b46\u62c6\u5206\u4e2d\u8a2d\u5b9a\u7684\u5e33\u6236\u8986\u5beb\u3002",

resources/lang/en_US/email.php

@@ -138,6 +138,14 @@ return [
     'new_journals_subject'                        => 'Firefly III has created a new transaction|Firefly III has created :count new transactions',
     'new_journals_header'                         => 'Firefly III has created a transaction for you. You can find it in your Firefly III installation:|Firefly III has created :count transactions for you. You can find them in your Firefly III installation:',
 
+    // subscription is overdue.
+    'subscriptions_overdue_subject_multi'               => 'You have :count subscriptions that are overdue to be paid',
+    'subscriptions_overdue_subject_single'               => 'You have a subscription that is overdue to be paid',
+    'subscriptions_overdue_warning_intro_single' => 'You have one subscription that is overdue to be paid. At the following date(s) a payment was expected, but it has not yet arrived.',
+    'subscriptions_overdue_warning_intro_multi' => 'You have :count subscription(s) that are overdue to be paid. At the following date(s) a payment was expected, but it has not yet arrived.',
+    'subscriptions_overdue_please_action_single' => 'Perhaps you have simply not linked a transaction to this subscription. In that case, please do so. You will NOT get another warning about this overdue subscription. A new warning will be sent out for the NEXT due payment.',
+    'subscriptions_overdue_please_action_multi' => 'Perhaps you have simply not linked a transaction to these subscriptions. In that case, please do so. You will NOT get another warning about these overdue subscriptions. A new warning will be sent out for the NEXT due payments.',
+    'subscriptions_overdue_outro' => 'If you believe this message is wrong, please contact the Firefly III developer. Thank you for using Firefly III.',
     // bill warning
     'bill_warning_subject_end_date'               => 'Your subscription ":name" is due to end in :diff days',
     'bill_warning_subject_now_end_date'           => 'Your subscription ":name" is due to end TODAY',

resources/lang/en_US/firefly.php

@@ -1648,7 +1648,7 @@ return [
     'profile_personal_access_tokens'                                            => 'Personal Access Tokens',
     'profile_personal_access_token'                                             => 'Personal Access Token',
     'profile_oauth_confidential'                                                => 'Confidential',
-    'profile_oauth_confidential_help'                                           => 'Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.',
+    'profile_oauth_confidential_help'                                           => 'Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as native desktop or JavaScript SPA applications, are unable to hold secrets securely.',
     'profile_personal_access_token_explanation'                                 => 'Here is your new personal access token. This is the only time it will be shown so don\'t lose it! You may now use this token to make API requests.',
     'profile_no_personal_access_token'                                          => 'You have not created any personal access tokens.',
     'profile_create_new_token'                                                  => 'Create new token',
@@ -1864,6 +1864,7 @@ return [
     'remove_budgeted_amount'                                                    => 'Remove budgeted amount in :currency',
 
     // bills:
+    'left_to_pay_active_bills' => 'active, expected and not yet paid subscriptions',
     'left_to_pay_lc' => 'left to pay',
     'less_than_expected' => 'less than expected',
     'more_than_expected' => 'more than expected',
@@ -1874,6 +1875,7 @@ return [
     'subscr_expected_x_times'                                                   => 'Expect to pay {{amount}} {{times}} times this period',
     'not_or_not_yet'                                                            => 'Not (yet)',
     'visit_bill'                                                                => 'Visit subscription ":name" at Firefly III',
+    'visit_bills'                                                                => 'Visit subscriptions at Firefly III',
     'match_between_amounts'                                                     => 'Subscription matches transactions between :low and :high.',
     'running_again_loss'                                                        => 'Previously linked transactions to this subscription may lose their connection, if they (no longer) match the rule(s).',
     'bill_related_rules'                                                        => 'Rules related to this subscription',
@@ -2331,6 +2333,7 @@ return [
 
 
     // reports:
+    'quick_link_needs_accounts' => 'In order to generate reports, you need to add at least one asset account to Firefly III.',
     'report_default'                                                            => 'Default financial report between :start and :end',
     'report_audit'                                                              => 'Transaction history overview between :start and :end',
     'report_category'                                                           => 'Category report between :start and :end',

resources/views/budgets/show.twig

@@ -158,8 +158,8 @@
                                     <td style="width:33%;">{{ 'amount'|_ }}</td>
                                     <td>
                                         {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
-                                        {% if convertToPrimary and 0 != limit.pc_amount %}
-                                            ({{ formatAmountBySymbol(limit.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                                        {% if convertToPrimary and null != limit.native_amount %}
+                                            ({{ formatAmountBySymbol(limit.native_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
                                         {% endif %}
                                     </td>
                                 </tr>

resources/views/emails/subscriptions-overdue-warning.blade.php

@@ -0,0 +1,24 @@
+@component('mail::message')
+@if(1 === $count)
+{{ trans('email.subscriptions_overdue_warning_intro_single') }}
+@endif
+@if(1 !== $count)
+{{ trans('email.subscriptions_overdue_warning_intro_multi', ['count' => $count]) }}
+@endif
+@foreach($info as $row)
+- {{ $row['bill']->name }}:
+  @foreach($row['pay_dates'] as $date)
+  - {{ $date }}
+@endforeach
+@endforeach
+
+@if(1 === $count)
+{{ trans('email.subscriptions_overdue_please_action_single') }}
+@endif
+@if(1 !== $count)
+{{ trans('email.subscriptions_overdue_please_action_multi', ['count' => $count]) }}
+@endif
+
+{{ trans('email.subscriptions_overdue_outro') }}
+
+@endcomponent

resources/views/list/bills.twig

@@ -189,6 +189,21 @@
                         <td class="hidden-sm hidden-xs">&nbsp;</td><!-- repeats -->
                     </tr>
                 {% endif %}
+                {% if '0' != sum.total_left_to_pay %}
+                    <tr>
+                        <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- handle -->
+                        <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- buttons -->
+                        <td colspan="2" style="text-align: right;"> <!-- title -->
+                            <small>{{ 'sum'|_ }} ({{ sum.currency_name }}) ({{ 'left_to_pay_active_bills'|_ }})</small>
+                        </td>
+                        <td style="text-align: right;"> <!-- amount -->
+                            {{ formatAmountBySymbol(sum.total_left_to_pay, sum.currency_symbol, sum.currency_decimal_places) }}
+                        </td>
+                        <td>&nbsp;</td> <!-- paid in period -->
+                        <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
+                        <td class="hidden-sm hidden-xs">&nbsp;</td><!-- repeats -->
+                    </tr>
+                {% endif %}
                 {% if '0' != sum.per_period %}
                     <tr>
                         <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- handle -->

resources/views/list/periods.twig

@@ -12,7 +12,6 @@
                         <td style="text-align: right;">{{ period.total_transactions }}</td>
                     </tr>
                 {% endif %}
-
                 {% for entry in period.spent %}
                     {% if entry.amount != 0 %}
                         <tr>

resources/views/list/piggy-banks.twig

@@ -46,8 +46,12 @@
                         {% endif %}
                     </td>
                     <td style="text-align: right;" class="piggySaved">
-                    <span title="Saved so far"
-                          style="text-align:right;">{{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
+                    <span title="Saved so far" style="text-align:right;">
+                        {{ formatAmountBySymbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}
+                        {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_current_amount %}
+                            ({{ formatAmountBySymbol(piggy.pc_current_amount,primaryCurrency.symbol,primaryCurrency.decimal_places) }})
+                        {% endif %}
+                    </span>
                     </td>
                     <td class="hidden-sm hidden-xs" style="text-align:right;width:40px;">
                         {% if piggy.current_amount > 0 %}
@@ -86,16 +90,25 @@
                     <td class="hidden-sm hidden-xs" style="text-align:right;">
                         {% if null != piggy.target_amount and 0 != piggy.target_amount %}
                             <span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
+                            {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_target_amount %}
+                                (<span title="{{ 'target_amount'|_ }}">{{ formatAmountBySymbol(piggy.pc_target_amount,primaryCurrency.symbol, primaryCurrency.decimal_places) }}</span>)
+                            {% endif %}
                         {% endif %}
                     </td>
                     <td class="hidden-sm hidden-xs" style="text-align:right;">
                         {% if piggy.left_to_save > 0 %}
                             <span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
+                            {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_left_to_save %}
+                                (<span title="{{ 'left_to_save'|_ }}">{{ formatAmountBySymbol(piggy.pc_left_to_save, primaryCurrency.symbol,primaryCurrency.decimal_places) }}</span>)
+                            {% endif %}
                         {% endif %}
                     </td>
                     <td class="hidden-sm hidden-xs" style="text-align:right;">
                         {% if piggy.target_date and piggy.save_per_month %}
                             {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
+                            {% if convertToPrimary and piggy.currency_id != primaryCurrency.id and null != piggy.pc_save_per_month %}
+                                ({{ formatAmountBySymbol(piggy.pc_save_per_month, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                            {% endif %}
                         {% endif %}
                     </td>
                 </tr>

resources/views/reports/index.twig

@@ -128,6 +128,12 @@
                     <h3 class="box-title">{{ 'quick_link_reports'|_ }}</h3>
                 </div>
                 <div class="box-body">
+                    {% if '' == accountList %}
+                    <p class="text-danger">
+                        {{ 'quick_link_needs_accounts'|_ }}
+                    </p>
+                    {% endif %}
+                    {% if '' != accountList %}
                     <p>
                         {{ 'quick_link_examples'|_ }}
                     </p>
@@ -172,6 +178,7 @@
                     <p>
                         <em>{{ 'reports_can_bookmark'|_ }}</em>
                     </p>
+                    {% endif %}
                 </div>
             </div>
 

resources/views/transactions/show.twig

@@ -64,7 +64,7 @@
                         <tbody>
                         <tr>
                             <td style="width:40%;">{{ trans('list.type') }}</td>
-                            <td>{{ first.transactiontype.type|_ }}</td>
+                            <td>{{ first.transaction_type_type|_ }}</td>
                         </tr>
                         <tr>
                             <td>{{ trans('list.description') }}</td>
@@ -113,7 +113,7 @@
                 <div class="box-body no-padding">
                     <table class="table table-hover">
                         <tbody>
-                        {% if first.transactiontype.type != 'Withdrawal' or splits == 1 %}
+                        {% if first.transaction_type_type != 'Withdrawal' or splits == 1 %}
                             <tr>
                                 <td style="width:40%;">
                                     {{ trans_choice('firefly.source_accounts', accounts['source']|length ) }}
@@ -134,7 +134,7 @@
                             </tr>
                         {% endif %}
 
-                        {% if first.transactiontype.type != 'Deposit' or splits == 1 %}
+                        {% if first.transaction_type_type != 'Deposit' or splits == 1 %}
                             <tr>
                                 <td>
                                     {{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }}
@@ -159,17 +159,17 @@
                             <td style="width:30%;">{{ 'total_amount'|_ }}</td>
                             <td>
                                 {% for amount in amounts %}
-                                    {% if first.transactiontype.type == 'Withdrawal' %}
+                                    {% if first.transaction_type_type == 'Withdrawal' %}
                                         {{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
-                                    {% elseif first.transactiontype.type == 'Deposit' %}
+                                    {% elseif first.transaction_type_type == 'Deposit' %}
                                         {{ formatAmountBySymbol(amount.amount,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
-                                    {% elseif first.transactiontype.type == 'Transfer' %}
+                                    {% elseif first.transaction_type_type == 'Transfer' %}
                                         <span class="text-info money-transfer">
                                         {{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
                                     </span>
-                                    {% elseif first.transactiontype.type == 'Opening balance' %}
+                                    {% elseif first.transaction_type_type == 'Opening balance' %}
                                         {# Opening balance stored amount is always negative: find out which way the money goes #}
-                                        {% if groupArray.transactions[0].source_type == 'Initial balance account' %}
+                                        {% if groupArray.transactions[0].source_account_type == 'Initial balance account' %}
                                             {{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}
                                         {% else %}
                                             {{ formatAmountBySymbol(amount.amount,amount.symbol, amount.decimal_places) }}
@@ -202,7 +202,7 @@
         {% set boxSize = 4 %}
     {% endif %}
     <div class="row">
-        {% for index,journal in groupArray.transactions %}
+        {% for index,journal in selectedGroup.transactions %}
             <div class="col-lg-{{ boxSize }}">
                 <div class="box">
                     <div class="box-header with-border">
@@ -289,48 +289,74 @@
                         <table class="table">
                             <tr>
                                 <td colspan="2">
-
-                                    <!-- type is: "{{ first.transactiontype.type }}" -->
-                                    {% if 'Cash account' == journal.source_type %}
+                                    <!-- type is: "{{ first.transaction_type_type }}" -->
+                                    {% if 'Cash account' == journal.source_account_type %}
                                         <span class="text-success">({{ 'cash'|_ }})</span>
                                     {% else %}
-                                        <a href="{{ route('accounts.show', journal.source_id) }}"
-                                           title="{{ journal.source_iban|default(journal.source_name) }}">{{ journal.source_name }}</a> &rarr;
+                                        <a href="{{ route('accounts.show', journal.source_account_id) }}"
+                                           title="{{ journal.source_iban|default(journal.source_account_name) }}">{{ journal.source_account_name }}</a> &rarr;
                                     {% endif %}
 
-                                    {% if first.transactiontype.type == 'Withdrawal' %}
+                                    {% if first.transaction_type_type == 'Withdrawal' %}
                                         {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
-                                    {% elseif first.transactiontype.type == 'Deposit' %}
+                                    {% elseif first.transaction_type_type == 'Deposit' %}
                                         {{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
-                                    {% elseif first.transactiontype.type == 'Transfer' or first.transactiontype.type == 'Opening balance' %}
+                                    {% elseif first.transaction_type_type == 'Transfer' or first.transaction_type_type == 'Opening balance' %}
                                         <span class="text-info money-transfer">
                                         {{ formatAmountBySymbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places, false) }}
                                     </span>
-                                    {% elseif first.transactiontype.type == 'Liability credit' %}
+                                    {% elseif first.transaction_type_type == 'Liability credit' %}
                                         <span class="text-info money-transfer">
                                         {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
                                     </span>
                                     {% endif %}
 
+                                    <!-- do primary currency amount -->
+                                    {% if null != journal.pc_amount and primaryCurrency.id != journal.currency_id %}
+                                        {% if first.transaction_type_type == 'Withdrawal' %}
+                                            ({{ formatAmountBySymbol(journal.pc_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                                        {% elseif first.transaction_type_type == 'Deposit' %}
+                                            ({{ formatAmountBySymbol(journal.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                                        {% elseif first.transaction_type_type == 'Transfer' %}
+                                            <span class="text-info money-transfer">
+                                        ({{ formatAmountBySymbol(journal.pc_amount, primaryCurrency.symbol, primaryCurrency.decimal_places, false) }})
+                                    </span>
+                                        {% endif %}
+                                    {% endif %}
+
                                     <!-- do foreign amount -->
                                     {% if null != journal.foreign_amount %}
-                                        {% if first.transactiontype.type == 'Withdrawal' %}
+                                        {% if first.transaction_type_type == 'Withdrawal' %}
                                             ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
-                                        {% elseif first.transactiontype.type == 'Deposit' %}
+                                        {% elseif first.transaction_type_type == 'Deposit' %}
                                             ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
-                                        {% elseif first.transactiontype.type == 'Transfer' %}
+                                        {% elseif first.transaction_type_type == 'Transfer' %}
                                             <span class="text-info money-transfer">
                                         ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                                     </span>
                                         {% endif %}
                                     {% endif %}
 
+                                    <!-- do foreign PC amount -->
+                                    {% if null != journal.pc_foreign_amount %}
+                                        {% if first.transaction_type_type == 'Withdrawal' %}
+                                            ({{ formatAmountBySymbol(journal.pc_foreign_amount*-1, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                                        {% elseif first.transaction_type_type == 'Deposit' %}
+                                            ({{ formatAmountBySymbol(journal.pc_foreign_amount, primaryCurrency.symbol, primaryCurrency.decimal_places) }})
+                                        {% elseif first.transaction_type_type == 'Transfer' %}
+                                            <span class="text-info money-transfer">
+                                        ({{ formatAmountBySymbol(journal.pc_foreign_amount, primaryCurrency.symbol, primaryCurrency.decimal_places, false) }})
+                                    </span>
+                                        {% endif %}
+                                    {% endif %}
+
+
                                     &rarr;
-                                    {% if 'Cash account' == journal.destination_type %}
+                                    {% if 'Cash account' == journal.destination_account_type %}
                                         <span class="text-success">({{ 'cash'|_ }})</span>
                                     {% else %}
-                                        <a href="{{ route('accounts.show', journal.destination_id) }}"
-                                           title="{{ journal.destination_iban|default(journal.destination_name) }}">{{ journal.destination_name }}</a>
+                                        <a href="{{ route('accounts.show', journal.destination_account_id) }}"
+                                           title="{{ journal.destination_iban|default(journal.destination_account_name) }}">{{ journal.destination_account_name }}</a>
                                     {% endif %}
                                 </td>
                             </tr>
@@ -346,7 +372,7 @@
                                     </td>
                                 </tr>
                             {% endif %}
-                            {% if null != journal.budget_id and first.transactiontype.type == 'Withdrawal' %}
+                            {% if null != journal.budget_id and first.transaction_type_type == 'Withdrawal' %}
                                 <tr>
                                     <td style="width:40%;">{{ 'budget'|_ }}</td>
                                     <td>
@@ -354,7 +380,7 @@
                                     </td>
                                 </tr>
                             {% endif %}
-                            {% if null != journal.bill_id and first.transactiontype.type == 'Withdrawal' %}
+                            {% if null != journal.bill_id and first.transaction_type_type == 'Withdrawal' %}
                                 <tr>
                                     <td style="width:40%;">{{ 'bill'|_ }}</td>
                                     <td>

resources/views/vendor/mail/text/message.blade.php

@@ -6,8 +6,14 @@
         @endcomponent
     @endslot
 
-    {{-- Body --}}
-    {{ $slot }}
+{{-- Body --}}
+{{ trans('email.greeting') }}
+
+{{ $slot }}
+
+{{ trans('email.closing') }}
+
+{{ trans('email.signature')}}
 
     {{-- Subcopy --}}
     @isset($subcopy)