Auto commit for release 'branch-v6.2' on 2024-12-26

Fix broken account balance.
Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2
2025-12-01 10:31:59 +00:00 · 2024-12-26 10:24:39 +01:00 · 2024-12-26 10:20:40 +01:00 · 2024-12-26 09:19:04 +01:00 · 2024-12-26 09:16:17 +01:00 · 2024-12-26 08:53:16 +01:00
25 changed files with 516 additions and 316 deletions
--- a/app/Api/V1/Controllers/Chart/AccountController.php
+++ b/app/Api/V1/Controllers/Chart/AccountController.php
@@ -116,7 +116,7 @@ class AccountController extends Controller
            ];
            // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
            $currentStart = clone $start;
-            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end);
+            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
            // 2022-10-11 this method no longer converts to float.
            $previous     = array_values($range)[0];
            while ($currentStart <= $end) {
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -50,11 +50,12 @@ abstract class Controller extends BaseController
    use DispatchesJobs;
    use ValidatesRequests;

-    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE    = 'application/vnd.api+json';

    /** @var array<int, string> */
    protected array        $allowedSort;
    protected ParameterBag $parameters;
+    protected bool        $convertToNative = false;

    /**
     * Controller constructor.
@@ -67,8 +68,10 @@ abstract class Controller extends BaseController
            function ($request, $next) {
                $this->parameters = $this->getParameters();
                if (auth()->check()) {
-                    $language = app('steam')->getLanguage();
+                    $language              = app('steam')->getLanguage();
+                    $this->convertToNative = app('preferences')->get('convert_to_native', false)->data;
                    app()->setLocale($language);
+
                }

                return $next($request);
--- a/app/Api/V2/Controllers/Chart/AccountController.php
+++ b/app/Api/V2/Controllers/Chart/AccountController.php
@@ -118,7 +118,7 @@ class AccountController extends Controller
            'native_entries'                 => [],
        ];
        $currentStart   = clone $params['start'];
-        $range          = app('steam')->finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $currency);
+        $range          = app('steam')->finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);

        $previous       = array_values($range)[0]['balance'];
        $previousNative = array_values($range)[0]['native_balance'];
--- a/app/Api/V2/Controllers/Controller.php
+++ b/app/Api/V2/Controllers/Controller.php
@@ -54,9 +54,10 @@ class Controller extends BaseController
 {
    use ValidatesUserGroupTrait;

-    protected const string CONTENT_TYPE   = 'application/vnd.api+json';
-    protected array        $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected const string CONTENT_TYPE     = 'application/vnd.api+json';
+    protected array        $acceptedRoles   = [UserRoleEnum::READ_ONLY];
    protected ParameterBag $parameters;
+    protected bool         $convertToNative = false;

    public function __construct()
    {
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -27,8 +27,8 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\BasicDataSupport;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
@@ -99,8 +99,8 @@ class IndexController extends Controller
            function (Account $account) use ($activities, $startBalances, $endBalances): void {
                $currency                   = $this->repository->getAccountCurrency($account);
                $account->lastActivityDate  = $this->isInArrayDate($activities, $account->id);
-                $account->startBalances     = $this->getBalance($account, $currency, $startBalances);
-                $account->endBalances       = $this->getBalance($account, $currency, $endBalances);
+                $account->startBalances     = Steam::filterAccountBalance($startBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
+                $account->endBalances       = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
                $account->differences       = $this->subtract($account->startBalances, $account->endBalances);
                $account->interest          = app('steam')->bcround($this->repository->getMetaValue($account, 'interest'), 4);
                $account->interestPeriod    = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
@@ -163,8 +163,8 @@ class IndexController extends Controller
                $interest                     = '' === $interest ? '0' : $interest;
                $currency                     = $this->repository->getAccountCurrency($account);

-                $account->startBalances       = $this->getBalance($account, $currency, $startBalances);
-                $account->endBalances         = $this->getBalance($account, $currency, $endBalances);
+                $account->startBalances       = Steam::filterAccountBalance($startBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
+                $account->endBalances         = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
                $account->differences         = $this->subtract($account->startBalances, $account->endBalances);
                $account->lastActivityDate    = $this->isInArrayDate($activities, $account->id);
                $account->interest            = app('steam')->bcround($interest, 4);
@@ -175,7 +175,7 @@ class IndexController extends Controller
                $account->location            = $this->repository->getLocation($account);
                $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
                $account->current_debt        = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
-                $account->currency            = $currency;
+                $account->currency            = $currency ?? $this->defaultCurrency;
                $account->iban                = implode(' ', str_split((string) $account->iban, 4));


@@ -194,23 +194,6 @@ class IndexController extends Controller
        return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
    }

-    private function getBalance(Account $account, ?TransactionCurrency $currency, array $balances): array
-    {
-        if (!array_key_exists($account->id, $balances)) {
-            return [];
-        }
-        $set = $balances[$account->id];
-
-        if ($this->convertToNative && $this->defaultCurrency->id === $currency?->id) {
-            unset($set['native_balance'], $set[$this->defaultCurrency->code]);
-        }
-        if ($this->convertToNative && null !== $currency && $this->defaultCurrency->id !== $currency->id) {
-            unset($set['balance']);
-        }
-
-        return $set;
-    }
-
    private function subtract(array $startBalances, array $endBalances)
    {
        $result = [];
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
@@ -90,7 +91,7 @@ class ShowController extends Controller
        // @var Carbon $end
        $end   ??= session('end');

-        if ($end < $start) {
+        if ($end->lt($start)) {
            [$start, $end] = [$end, $start];
        }
        $location         = $this->repository->getLocation($account);
@@ -99,7 +100,8 @@ class ShowController extends Controller
        $subTitleIcon     = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
        $page             = (int) $request->get('page');
        $pageSize         = (int) app('preferences')->get('listPageSize', 50)->data;
-        $currency         = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
+        $accountCurrency  = $this->repository->getAccountCurrency($account);
+        $currency         = $accountCurrency ?? Amount::getDefaultCurrency();
        $fStart           = $start->isoFormat($this->monthAndDayFormat);
        $fEnd             = $end->isoFormat($this->monthAndDayFormat);
        $subTitle         = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
@@ -129,7 +131,7 @@ class ShowController extends Controller

        $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
        $showAll          = false;
-        $balance          = Steam::finalAccountBalance($account, $end)['balance'];
+        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);

        return view(
            'accounts.show',
@@ -148,7 +150,7 @@ class ShowController extends Controller
                'end',
                'chartUrl',
                'location',
-                'balance'
+                'balances'
            )
        );
    }
@@ -165,33 +167,34 @@ class ShowController extends Controller
        if (!$this->isEditableAccount($account)) {
            return $this->redirectAccountToAccount($account);
        }
-        $location     = $this->repository->getLocation($account);
-        $isLiability  = $this->repository->isLiability($account);
-        $attachments  = $this->repository->getAttachments($account);
-        $objectType   = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
-        $end          = today(config('app.timezone'));
-        $today        = today(config('app.timezone'));
-        $start        = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
-        $subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
-        $currency     = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
-        $subTitle     = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
-        $periods      = new Collection();
+        $location        = $this->repository->getLocation($account);
+        $isLiability     = $this->repository->isLiability($account);
+        $attachments     = $this->repository->getAttachments($account);
+        $objectType      = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
+        $end             = today(config('app.timezone'));
+        $today           = today(config('app.timezone'));
+        $accountCurrency = $this->repository->getAccountCurrency($account);
+        $start           = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
+        $subTitleIcon    = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
+        $page            = (int) $request->get('page');
+        $pageSize        = (int) app('preferences')->get('listPageSize', 50)->data;
+        $currency        = $this->repository->getAccountCurrency($account) ?? Amount::getDefaultCurrency();
+        $subTitle        = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
+        $periods         = new Collection();

        /** @var GroupCollectorInterface $collector */
-        $collector    = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();

        // this search will not include transaction groups where this asset account (or liability)
        // is just part of ONE of the journals. To force this:
        $collector->setExpandGroupSearch(true);

-        $groups       = $collector->getPaginatedGroups();
+        $groups          = $collector->getPaginatedGroups();
        $groups->setPath(route('accounts.show.all', [$account->id]));
-        $chartUrl     = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
-        $showAll      = true;
-        $balance      = Steam::finalAccountBalance($account, $end)['balance'];
+        $chartUrl        = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+        $showAll         = true;
+        $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);

        return view(
            'accounts.show',
@@ -211,7 +214,7 @@ class ShowController extends Controller
                'subTitle',
                'start',
                'end',
-                'balance'
+                'balances'
            )
        );
    }
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -71,29 +71,30 @@ class IndexController extends Controller
    {
        $this->cleanupObjectGroups();
        $this->repository->correctOrder();
-        $start           = session('start');
-        $end             = session('end');
-        $collection      = $this->repository->getBills();
-        $total           = $collection->count();
+        $start       = session('start');
+        $end         = session('end');
+        $collection  = $this->repository->getBills();
+        $total       = $collection->count();

-        $defaultCurrency = app('amount')->getDefaultCurrency();
-        $parameters      = new ParameterBag();
+        $parameters  = new ParameterBag();
        // sub one day from temp start so the last paid date is one day before it should be.
-        $tempStart       = clone $start;
+        $tempStart   = clone $start;
        // 2023-06-23 do not sub one day from temp start, fix is in BillTransformer::payDates instead
        // $tempStart->subDay();
        $parameters->set('start', $tempStart);
        $parameters->set('end', $end);
+        $parameters->set('convertToNative', $this->convertToNative);
+        $parameters->set('defaultCurrency', $this->defaultCurrency);

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

        // loop all bills, convert to array and add rules and stuff.
-        $rules           = $this->repository->getRulesForBills($collection);
+        $rules       = $this->repository->getRulesForBills($collection);

        // make bill groups:
-        $bills           = [
+        $bills       = [
            0 => [ // the index is the order, not the ID.
                'object_group_id'    => 0,
                'object_group_title' => (string) trans('firefly.default_group_title_name'),
@@ -112,7 +113,7 @@ class IndexController extends Controller
                'bills'              => [],
            ];

-            $currency                         = $bill->transactionCurrency ?? $defaultCurrency;
+            $currency                         = $bill->transactionCurrency ?? $this->defaultCurrency;
            $array['currency_id']             = $currency->id;
            $array['currency_name']           = $currency->name;
            $array['currency_symbol']         = $currency->symbol;
@@ -122,14 +123,13 @@ class IndexController extends Controller
            $array['rules']                   = $rules[$bill['id']] ?? [];
            $bills[$groupOrder]['bills'][]    = $array;
        }
-
        // order by key
        ksort($bills);

        // summarise per currency / per group.
-        $sums            = $this->getSums($bills);
-        $totals          = $this->getTotals($sums);
-        $today           = now()->startOfDay();
+        $sums        = $this->getSums($bills);
+        $totals      = $this->getTotals($sums);
+        $today       = now()->startOfDay();

        return view('bills.index', compact('bills', 'sums', 'total', 'totals', 'today'));
    }
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -30,7 +30,6 @@ use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -418,83 +417,111 @@ class AccountController extends Controller
     */
    public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
    {
-        $chartData  = [];
-        $cache      = new CacheProperties();
+        Log::debug('Now in period()');
+        $chartData       = [];
+        $cache           = new CacheProperties();
        $cache->addProperty('chart.account.period');
        $cache->addProperty($start);
        $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
        $cache->addProperty($account->id);
        if ($cache->has()) {
-            return response()->json($cache->get());
-        }
-        $currencies = $this->accountRepository->getUsedCurrencies($account);
-
-        // if the account is not expense or revenue, just use the account's default currency.
-        if (!in_array($account->accountType->type, [AccountType::REVENUE, AccountType::EXPENSE], true)) {
-            $currencies = [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
+            // return response()->json($cache->get());
        }

-        /** @var TransactionCurrency $currency */
-        foreach ($currencies as $currency) {
-            $chartData[] = $this->periodByCurrency($start, $end, $account, $currency);
-        }
-
-        $data       = $this->generator->multiSet($chartData);
-        $cache->store($data);
-
-        return response()->json($data);
-    }
-
-    /**
-     * @throws FireflyException
-     */
-    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
-    {
-        Log::debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
-        $locale            = app('steam')->getLocale();
-        $step              = $this->calculateStep($start, $end);
-        $result            = [
-            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
-            'currency_symbol' => $currency->symbol,
-            'currency_code'   => $currency->code,
-        ];
-        $entries           = [];
-        $current           = clone $start;
+        // collect and filter balances for the entire period.
+        $step            = $this->calculateStep($start, $end);
        Log::debug(sprintf('Step is %s', $step));
+        $locale          = app('steam')->getLocale();
+        $return          = [];

        // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
        // have to make sure this chart is always based on the balance at the END of the period.
        // This period depends on the size of the chart
-        $current           = app('navigation')->endOfX($current, $step, null);
-        Log::debug(sprintf('$current date is %s', $current->format('Y-m-d')));
-        if ('1D' === $step) {
-            // per day the entire period, balance for every day.
-            $format   = (string) trans('config.month_and_day_js', [], $locale);
-            $range    = app('steam')->finalAccountBalanceInRange($account, $start, $end);
-            $previous = array_values($range)[0];
-            while ($end >= $current) {
-                $theDate         = $current->format('Y-m-d');
-                $balance         = $range[$theDate]['balance'] ?? $previous;
-                $label           = $current->isoFormat($format);
-                $entries[$label] = (float) $balance;
-                $previous        = $balance;
-                $current->addDay();
-            }
-        }
-        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
-            while ($end >= $current) {
-                Log::debug(sprintf('Current is: %s', $current->format('Y-m-d')));
-                $balance         = Steam::finalAccountBalance($account, $current)[$currency->code] ?? '0';
-                $label           = app('navigation')->periodShow($current, $step);
-                $entries[$label] = $balance;
-                $current         = app('navigation')->addPeriod($current, $step, 0);
-                // here too, to fix #8041, the data is corrected to the end of the period.
-                $current         = app('navigation')->endOfX($current, $step, null);
-            }
-        }
-        $result['entries'] = $entries;
+        $current         = clone $start;
+        $current         = app('navigation')->endOfX($current, $step, null);
+        $format          = (string) trans('config.month_and_day_js', [], $locale);
+        $accountCurrency = $this->accountRepository->getAccountCurrency($account);

-        return $result;
+        Log::debug('One');
+        $range           = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToNative);
+        Log::debug('Two');
+        $range           = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
+        Log::debug('Three');
+
+        // temp, get end balance.
+        Log::debug('temp get end balance');
+        Steam::finalAccountBalance($account, $end);
+        Log::debug('END temp get end balance done');
+
+        $previous        = array_values($range)[0];
+        $accountCurrency ??= $this->defaultCurrency; // do this AFTER getting the balances.
+        Log::debug('Start chart loop.');
+
+        $newRange        = [];
+        $expectedIndex   = 0;
+        Log::debug('Balances exist at:');
+        foreach ($range as $key => $value) {
+            $newRange[] = ['date' => $key, 'info' => $value];
+            Log::debug(sprintf(' - %s', $key));
+        }
+        $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date']);
+        while ($end->gte($current)) {
+            $momentBalance = $previous;
+            $theDate       = $current->format('Y-m-d');
+            while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
+                $momentBalance = $newRange[$expectedIndex]['info'];
+                Log::debug(sprintf('Expected index is %d!, date is %s, current is %s', $expectedIndex, $carbon->format('Y-m-d'), $current->format('Y-m-d')));
+                $carbon        = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date']);
+                ++$expectedIndex;
+            }
+
+            $return        = $this->updateChartKeys($return, $momentBalance);
+            $previous      = $momentBalance;
+
+            Log::debug(sprintf('Now at %s', $theDate), $momentBalance);
+
+
+            // process each balance thing.
+            foreach ($momentBalance as $key => $amount) {
+                $label                           = $current->isoFormat($format);
+                $return[$key]['entries'][$label] = $amount;
+            }
+            $current       = app('navigation')->addPeriod($current, $step, 0);
+            // here too, to fix #8041, the data is corrected to the end of the period.
+            $current       = app('navigation')->endOfX($current, $step, null);
+            Log::debug(sprintf('Next moment is %s', $current->format('Y-m-d')));
+
+        }
+        Log::debug('End of chart loop.');
+        // second loop (yes) to create nice array with info! Yay!
+        $chartData       = [];
+
+        foreach ($return as $key => $info) {
+            if (3 === strlen($key)) {
+                // assume it's a currency:
+                $setCurrency             = $this->currencyRepository->findByCode($key);
+                $info['currency_symbol'] = $setCurrency->symbol;
+                $info['currency_code']   = $setCurrency->code;
+                $info['label']           = sprintf('%s (%s)', $account->name, $setCurrency->symbol);
+            }
+            if ('balance' === $key) {
+                $info['currency_symbol'] = $accountCurrency->symbol;
+                $info['currency_code']   = $accountCurrency->code;
+                $info['label']           = sprintf('%s (%s)', $account->name, $accountCurrency->symbol);
+            }
+            if ('native_balance' === $key) {
+                $info['currency_symbol'] = $this->defaultCurrency->symbol;
+                $info['currency_code']   = $this->defaultCurrency->code;
+                $info['label']           = sprintf('%s (%s) (%s)', $account->name, (string) trans('firefly.sum'), $this->defaultCurrency->symbol);
+            }
+            $chartData[] = $info;
+        }
+
+        $data            = $this->generator->multiSet($chartData);
+        $cache->store($data);
+
+        return response()->json($data);
    }

    /**
@@ -633,4 +660,15 @@ class AccountController extends Controller

        return response()->json($data);
    }
+
+    private function updateChartKeys(array $array, array $balances): array
+    {
+        foreach (array_keys($balances) as $key) {
+            $array[$key] ??= [
+                'key' => $key,
+            ];
+        }
+
+        return $array;
+    }
 }
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -193,11 +193,11 @@ class CategoryController extends Controller

            $chartData[$inKey]
                          = [
-                    'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
-                    'entries'         => [],
-                    'type'            => 'bar',
-                    'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
-                ];
+                              'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
+                              'entries'         => [],
+                              'type'            => 'bar',
+                              'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
+                          ];
            // loop empty periods:
            foreach (array_keys($periods) as $period) {
                $label                                 = $periods[$period];
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -54,7 +54,7 @@ abstract class Controller extends BaseController
    protected string $dateTimeFormat;
    protected string $monthAndDayFormat;
    protected bool $convertToNative = false;
-    protected TransactionCurrency $defaultCurrency;
+    protected ?TransactionCurrency $defaultCurrency;
    protected string $monthFormat;
    protected string $redirectUrl = '/';

@@ -113,10 +113,11 @@ abstract class Controller extends BaseController
                $this->monthFormat       = (string) trans('config.month_js', [], $locale);
                $this->monthAndDayFormat = (string) trans('config.month_and_day_js', [], $locale);
                $this->dateTimeFormat    = (string) trans('config.date_time_js', [], $locale);
-                $this->defaultCurrency   = app('amount')->getDefaultCurrency();
                $darkMode                = 'browser';
+                $this->defaultCurrency   =null;
                // get shown-intro-preference:
                if (auth()->check()) {
+                    $this->defaultCurrency   = app('amount')->getDefaultCurrency();
                    $language  = Steam::getLanguage();
                    $locale    = Steam::getLocale();
                    $darkMode  = app('preferences')->get('darkMode', 'browser')->data;
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -123,10 +123,10 @@ class ReconcileController extends Controller
        Log::debug(sprintf('End balance: "%s"', $endBalance));
        Log::debug(sprintf('Cleared amount: "%s"', $clearedAmount));
        Log::debug(sprintf('Amount: "%s"', $amount));
-        $difference      = bcadd(bcadd(bcsub($startBalance, $endBalance), $clearedAmount), $amount);
+        $difference      = bcadd(bcadd(bcsub($startBalance ?? '0', $endBalance ?? '0'), $clearedAmount ?? '0'), $amount);
        $diffCompare     = bccomp($difference, '0');
        $countCleared    = count($clearedJournals);
-        $reconSum        = bcadd(bcadd($startBalance, $amount), $clearedAmount);
+        $reconSum        = bcadd(bcadd($startBalance ?? '0', $amount ?? '0'), $clearedAmount ?? '0');

        try {
            $view = view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared', 'reconSum', 'selectedIds'))->render();
--- a/app/Http/Middleware/Installer.php
+++ b/app/Http/Middleware/Installer.php
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Http\Middleware;

-use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Database\QueryException;
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -47,19 +47,21 @@ class Bill extends Model

    protected $casts
                      = [
-            'created_at'      => 'datetime',
-            'updated_at'      => 'datetime',
-            'deleted_at'      => 'datetime',
-            'date'            => SeparateTimezoneCaster::class,
-            'end_date'        => SeparateTimezoneCaster::class,
-            'extension_date'  => SeparateTimezoneCaster::class,
-            'skip'            => 'int',
-            'automatch'       => 'boolean',
-            'active'          => 'boolean',
-            'name_encrypted'  => 'boolean',
-            'match_encrypted' => 'boolean',
-            'amount_min'      => 'string',
-            'amount_max'      => 'string',
+            'created_at'             => 'datetime',
+            'updated_at'             => 'datetime',
+            'deleted_at'             => 'datetime',
+            'date'                   => SeparateTimezoneCaster::class,
+            'end_date'               => SeparateTimezoneCaster::class,
+            'extension_date'         => SeparateTimezoneCaster::class,
+            'skip'                   => 'int',
+            'automatch'              => 'boolean',
+            'active'                 => 'boolean',
+            'name_encrypted'         => 'boolean',
+            'match_encrypted'        => 'boolean',
+            'amount_min'             => 'string',
+            'amount_max'             => 'string',
+            'native_amount_min'      => 'string',
+            'native_amount_max'      => 'string',
        ];

    protected $fillable
@@ -81,6 +83,8 @@ class Bill extends Model
            'extension_date',
            'end_date_tz',
            'extension_date_tz',
+            'native_amount_min',
+            'native_amount_max',
        ];

    protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -431,11 +431,10 @@ class AccountRepository implements AccountRepositoryInterface

    public function getUsedCurrencies(Account $account): Collection
    {
-        $info        = $account->transactions()->get(['transaction_currency_id', 'foreign_currency_id'])->toArray();
+        $info        = $account->transactions()->distinct()->groupBy('transaction_currency_id')->get(['transaction_currency_id'])->toArray();
        $currencyIds = [];
        foreach ($info as $entry) {
            $currencyIds[] = (int) $entry['transaction_currency_id'];
-            $currencyIds[] = (int) $entry['foreign_currency_id'];
        }
        $currencyIds = array_unique($currencyIds);

--- a/app/Support/Http/Controllers/ChartGeneration.php
+++ b/app/Support/Http/Controllers/ChartGeneration.php
@@ -81,7 +81,7 @@ trait ChartGeneration
            ];

            $currentStart = clone $start;
-            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end);
+            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
            $previous     = array_values($range)[0];
            while ($currentStart <= $end) {
                $format                        = $currentStart->format('Y-m-d');
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -29,6 +29,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;

 /**
@@ -69,11 +70,12 @@ class Steam
        return $sum;
    }

-    public function finalAccountBalanceInRange(Account $account, Carbon $start, Carbon $end): array
+    public function finalAccountBalanceInRange(Account $account, Carbon $start, Carbon $end, bool $convertToNative): array
    {
        // expand period.
        $start->subDay()->startOfDay();
        $end->addDay()->endOfDay();
+        Log::debug(sprintf('finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));

        // set up cache
        $cache                = new CacheProperties();
@@ -89,14 +91,23 @@ class Steam
        $formatted            = $start->format('Y-m-d');
        $startBalance         = $this->finalAccountBalance($account, $start);
        $defaultCurrency      = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
-        $currency             = $this->getAccountCurrency($account) ?? $defaultCurrency;
+        $accountCurrency      = $this->getAccountCurrency($account);
+        $hasCurrency          = null !== $accountCurrency;
+        $currency             = $accountCurrency ?? $defaultCurrency;
+        Log::debug(sprintf('Currency is %s', $currency->code));
+        if (!$hasCurrency) {
+            Log::debug(sprintf('Also set start balance in %s', $defaultCurrency->code));
+            $startBalance[$defaultCurrency->code] ??= '0';
+        }
        $currencies           = [
            $currency->id        => $currency,
            $defaultCurrency->id => $defaultCurrency,
        ];
-        $startBalance[$defaultCurrency->code] ??= '0';
-        $startBalance[$currency->code]        ??= '0';
+
+
+        $startBalance[$currency->code] ??= '0';
        $balances[$formatted] = $startBalance;
+        Log::debug('Final start balance: ', $startBalance);


        // sums up the balance changes per day, for foreign, native and normal amounts.
@@ -113,10 +124,10 @@ class Steam
                [ // @phpstan-ignore-line
                    'transaction_journals.date',
                    'transactions.transaction_currency_id',
-                    \DB::raw('SUM(transactions.amount) AS modified'),
+                    DB::raw('SUM(transactions.amount) AS modified'),
                    'transactions.foreign_currency_id',
-                    \DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
-                    \DB::raw('SUM(transactions.native_amount) AS modified_native'),
+                    DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
+                    DB::raw('SUM(transactions.native_amount) AS modified_native'),
                ]
            )
        ;
@@ -125,33 +136,55 @@ class Steam

        /** @var Transaction $entry */
        foreach ($set as $entry) {
-
            // normal, native and foreign amount
            $carbon                             = new Carbon($entry->date, $entry->date_tz);
            $modified                           = (string) (null === $entry->modified ? '0' : $entry->modified);
            $foreignModified                    = (string) (null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
            $nativeModified                     = (string) (null === $entry->modified_native ? '0' : $entry->modified_native);

-            // add "modified" to amount if the currency id matches the account currency id.
-            if ($entry->transaction_currency_id === $currency->id) {
-                $currentBalance['balance']       = bcadd($currentBalance['balance'], $modified);
-                $currentBalance[$currency->code] = bcadd($currentBalance[$currency->code], $modified);
+            // find currency of this entry.
+            $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);
+            $entryCurrency                      = $currencies[$entry->transaction_currency_id];
+
+            Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
+
+            // if convert to native, if NOT convert to native.
+            if ($convertToNative) {
+                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $this->bcround($modified, 2), $this->bcround($foreignModified, 2), $this->bcround($nativeModified, 2)));
+                // if the currency is the default currency add to native balance + currency balance
+                if ($entry->transaction_currency_id === $defaultCurrency->id) {
+                    Log::debug('Add amount to native.');
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $modified);
+                }
+
+                // add to native balance.
+                if ($entry->foreign_currency_id !== $defaultCurrency->id) {
+                    // this check is not necessary, because if the foreign currency is the same as the default currency, the native amount is zero.
+                    // so adding this would mean nothing.
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeModified);
+                }
+                if ($entry->foreign_currency_id === $defaultCurrency->id) {
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $foreignModified);
+                }
+                // add to balance if is the same.
+                if ($entry->transaction_currency_id === $accountCurrency?->id) {
+                    $currentBalance['balance'] = bcadd($currentBalance['balance'], $modified);
+                }
+                // add currency balance
+                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
            }
-
-            // always add the native balance, even if it ends up at zero.
-            $currentBalance['native_balance']   = bcadd($currentBalance['native_balance'], $nativeModified);
-
-            // add modified foreign to the array
-            if (null !== $entry->foreign_currency_id) {
-                $foreignId                              = $entry->foreign_currency_id;
-                $currencies[$foreignId]                 ??= TransactionCurrency::find($foreignId);
-                $foreignCurrency                        = $currencies[$foreignId];
-                $currentBalance[$foreignCurrency->code] ??= '0';
-                $currentBalance[$foreignCurrency->code] = bcadd($currentBalance[$foreignCurrency->code], $foreignModified);
+            if (!$convertToNative) {
+                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $modified, $foreignModified, $nativeModified));
+                // add to balance, as expected.
+                $currentBalance['balance']            = bcadd($currentBalance['balance'] ?? '0', $modified);
+                // add to GBP, as expected.
+                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
            }
            $balances[$carbon->format('Y-m-d')] = $currentBalance;
+            Log::debug('Updated entry', $currentBalance);
        }
        $cache->store($balances);
+        Log::debug('End of method');

        return $balances;
    }
@@ -297,7 +330,7 @@ class Steam
            if ($native->id === $accountCurrency?->id) {
                $return['balance'] = bcadd('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance, $return['balance']);
            }
-            Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $return['balance']));
+            Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $this->bcround($return['balance'], 2)));

            // native balance
            $return['native_balance'] = (string) $account->transactions()
@@ -308,7 +341,7 @@ class Steam
            ;
            // plus native virtual balance.
            $return['native_balance'] = bcadd('' === (string) $account->native_virtual_balance ? '0' : $account->native_virtual_balance, $return['native_balance']);
-            Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $return['native_balance']));
+            Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $this->bcround($return['native_balance'])));

            // plus foreign transactions in THIS currency.
            $sum                      = (string) $account->transactions()
@@ -320,7 +353,7 @@ class Steam
            ;
            $return['native_balance'] = bcadd($return['native_balance'], $sum);

-            Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $sum, $return['native_balance']));
+            Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $this->bcround($sum), $this->bcround($return['native_balance'])));
        }

        // balance(s) in other (all) currencies.
@@ -351,8 +384,73 @@ class Steam
            $return['native_balance'] = $sum;
            unset($return['balance']);
        }
+        $final           = array_merge($return, $others);
+        Log::debug('Return is', $final);

-        return array_merge($return, $others);
+        return $final;
+    }
+
+    public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array
+    {
+        Log::debug(sprintf('filterAccountBalances(#%d)', $account->id));
+        $return = [];
+        foreach ($total as $key => $value) {
+            $return[$key] = $this->filterAccountBalance($value, $account, $convertToNative, $currency);
+        }
+        Log::debug(sprintf('end of filterAccountBalances(#%d)', $account->id));
+
+        return $return;
+    }
+
+    public function filterAccountBalance(array $set, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array
+    {
+        Log::debug(sprintf('filterAccountBalance(#%d)', $account->id), $set);
+        if (0 === count($set)) {
+            Log::debug(sprintf('Return empty array for account #%d', $account->id));
+
+            return [];
+        }
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        if ($convertToNative) {
+            if ($defaultCurrency->id === $currency?->id) {
+                Log::debug(sprintf('Unset "native_balance" and "%s" for account #%d', $defaultCurrency->code, $account->id));
+                unset($set['native_balance'], $set[$defaultCurrency->code]);
+            }
+            if (null !== $currency && $defaultCurrency->id !== $currency->id) {
+                Log::debug(sprintf('Unset balance for account #%d', $account->id));
+                unset($set['balance']);
+            }
+
+            if (null === $currency) {
+                Log::debug(sprintf('TEMP DO NOT Drop defaultCurrency balance for account #%d', $account->id));
+                // unset($set[$this->defaultCurrency->code]);
+            }
+        }
+
+        if (!$convertToNative) {
+            if (null === $currency) {
+                Log::debug(sprintf('Unset native_balance and make defaultCurrency balance the balance for account #%d', $account->id));
+                $set['balance'] = $set[$defaultCurrency->code] ?? '0';
+                unset($set['native_balance'], $set[$defaultCurrency->code]);
+            }
+
+            if (null !== $currency) {
+                Log::debug(sprintf('Unset native_balance + defaultCurrency + currencyCode balance for account #%d', $account->id));
+                unset($set['native_balance'], $set[$defaultCurrency->code], $set[$currency->code]);
+            }
+        }
+
+
+        // put specific value first in array.
+        if (array_key_exists('native_balance', $set)) {
+            $set = ['native_balance' => $set['native_balance']] + $set;
+        }
+        if (array_key_exists('balance', $set)) {
+            $set = ['balance' => $set['balance']] + $set;
+        }
+        Log::debug(sprintf('Return #%d', $account->id), $set);
+
+        return $set;
    }

    private function groupAndSumTransactions(array $array, string $group, string $field): array
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -104,7 +104,7 @@ class AccountTransformer extends AbstractTransformer
            'currency_code'           => $currencyCode,
            'currency_symbol'         => $currencySymbol,
            'currency_decimal_places' => $decimalPlaces,
-            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'], $decimalPlaces),
+            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'] ?? '0', $decimalPlaces),
            'current_balance_date'    => $date->toAtomString(),
            'notes'                   => $this->repository->getNoteText($account),
            'monthly_payment_date'    => $monthlyPaymentDate,
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@@ -30,6 +30,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Models\BillDateCalculator;
 use Illuminate\Support\Collection;

@@ -58,6 +59,8 @@ class BillTransformer extends AbstractTransformer
     */
    public function transform(Bill $bill): array
    {
+        $defaultCurrency   = $this->parameters->get('defaultCurrency') ?? Amount::getDefaultCurrency();
+
        $paidData          = $this->paidData($bill);
        $lastPaidDate      = $this->getLastPaidDate($paidData);
        $start             = $this->parameters->get('start') ?? today()->subYears(10);
@@ -149,6 +152,8 @@ class BillTransformer extends AbstractTransformer
            'name'                     => $bill->name,
            'amount_min'               => app('steam')->bcround($bill->amount_min, $currency->decimal_places),
            'amount_max'               => app('steam')->bcround($bill->amount_max, $currency->decimal_places),
+            'native_amount_min'        => app('steam')->bcround($bill->native_amount_min, $defaultCurrency->decimal_places),
+            'native_amount_max'        => app('steam')->bcround($bill->native_amount_max, $defaultCurrency->decimal_places),
            'date'                     => $bill->date->toAtomString(),
            'end_date'                 => $bill->end_date?->toAtomString(),
            'extension_date'           => $bill->extension_date?->toAtomString(),
--- a/package-lock.json
+++ b/package-lock.json
@@ -1709,9 +1709,9 @@
            }
        },
        "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
-            "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+            "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
            "cpu": [
                "ppc64"
            ],
@@ -1726,9 +1726,9 @@
            }
        },
        "node_modules/@esbuild/android-arm": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
-            "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+            "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
            "cpu": [
                "arm"
            ],
@@ -1743,9 +1743,9 @@
            }
        },
        "node_modules/@esbuild/android-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
-            "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+            "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
            "cpu": [
                "arm64"
            ],
@@ -1760,9 +1760,9 @@
            }
        },
        "node_modules/@esbuild/android-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
-            "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+            "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
            "cpu": [
                "x64"
            ],
@@ -1777,9 +1777,9 @@
            }
        },
        "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
-            "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+            "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
            "cpu": [
                "arm64"
            ],
@@ -1794,9 +1794,9 @@
            }
        },
        "node_modules/@esbuild/darwin-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
-            "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+            "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
            "cpu": [
                "x64"
            ],
@@ -1811,9 +1811,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
-            "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
            "cpu": [
                "arm64"
            ],
@@ -1828,9 +1828,9 @@
            }
        },
        "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
-            "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+            "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
            "cpu": [
                "x64"
            ],
@@ -1845,9 +1845,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
-            "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+            "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
            "cpu": [
                "arm"
            ],
@@ -1862,9 +1862,9 @@
            }
        },
        "node_modules/@esbuild/linux-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
-            "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+            "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
            "cpu": [
                "arm64"
            ],
@@ -1879,9 +1879,9 @@
            }
        },
        "node_modules/@esbuild/linux-ia32": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
-            "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+            "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
            "cpu": [
                "ia32"
            ],
@@ -1896,9 +1896,9 @@
            }
        },
        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
-            "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+            "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
            "cpu": [
                "loong64"
            ],
@@ -1913,9 +1913,9 @@
            }
        },
        "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
-            "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+            "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
            "cpu": [
                "mips64el"
            ],
@@ -1930,9 +1930,9 @@
            }
        },
        "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
-            "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+            "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
            "cpu": [
                "ppc64"
            ],
@@ -1947,9 +1947,9 @@
            }
        },
        "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
-            "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+            "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
            "cpu": [
                "riscv64"
            ],
@@ -1964,9 +1964,9 @@
            }
        },
        "node_modules/@esbuild/linux-s390x": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
-            "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+            "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
            "cpu": [
                "s390x"
            ],
@@ -1981,9 +1981,9 @@
            }
        },
        "node_modules/@esbuild/linux-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
-            "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+            "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
            "cpu": [
                "x64"
            ],
@@ -1997,10 +1997,27 @@
                "node": ">=18"
            }
        },
+        "node_modules/@esbuild/netbsd-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
        "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
-            "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
            "cpu": [
                "x64"
            ],
@@ -2015,9 +2032,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
-            "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
            "cpu": [
                "arm64"
            ],
@@ -2032,9 +2049,9 @@
            }
        },
        "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
-            "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
            "cpu": [
                "x64"
            ],
@@ -2049,9 +2066,9 @@
            }
        },
        "node_modules/@esbuild/sunos-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
-            "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+            "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
            "cpu": [
                "x64"
            ],
@@ -2066,9 +2083,9 @@
            }
        },
        "node_modules/@esbuild/win32-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
-            "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+            "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
            "cpu": [
                "arm64"
            ],
@@ -2083,9 +2100,9 @@
            }
        },
        "node_modules/@esbuild/win32-ia32": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
-            "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+            "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
            "cpu": [
                "ia32"
            ],
@@ -2100,9 +2117,9 @@
            }
        },
        "node_modules/@esbuild/win32-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
-            "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+            "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
            "cpu": [
                "x64"
            ],
@@ -5793,9 +5810,9 @@
            }
        },
        "node_modules/esbuild": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
-            "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+            "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
            "dev": true,
            "hasInstallScript": true,
            "license": "MIT",
@@ -5806,30 +5823,31 @@
                "node": ">=18"
            },
            "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.24.0",
-                "@esbuild/android-arm": "0.24.0",
-                "@esbuild/android-arm64": "0.24.0",
-                "@esbuild/android-x64": "0.24.0",
-                "@esbuild/darwin-arm64": "0.24.0",
-                "@esbuild/darwin-x64": "0.24.0",
-                "@esbuild/freebsd-arm64": "0.24.0",
-                "@esbuild/freebsd-x64": "0.24.0",
-                "@esbuild/linux-arm": "0.24.0",
-                "@esbuild/linux-arm64": "0.24.0",
-                "@esbuild/linux-ia32": "0.24.0",
-                "@esbuild/linux-loong64": "0.24.0",
-                "@esbuild/linux-mips64el": "0.24.0",
-                "@esbuild/linux-ppc64": "0.24.0",
-                "@esbuild/linux-riscv64": "0.24.0",
-                "@esbuild/linux-s390x": "0.24.0",
-                "@esbuild/linux-x64": "0.24.0",
-                "@esbuild/netbsd-x64": "0.24.0",
-                "@esbuild/openbsd-arm64": "0.24.0",
-                "@esbuild/openbsd-x64": "0.24.0",
-                "@esbuild/sunos-x64": "0.24.0",
-                "@esbuild/win32-arm64": "0.24.0",
-                "@esbuild/win32-ia32": "0.24.0",
-                "@esbuild/win32-x64": "0.24.0"
+                "@esbuild/aix-ppc64": "0.24.2",
+                "@esbuild/android-arm": "0.24.2",
+                "@esbuild/android-arm64": "0.24.2",
+                "@esbuild/android-x64": "0.24.2",
+                "@esbuild/darwin-arm64": "0.24.2",
+                "@esbuild/darwin-x64": "0.24.2",
+                "@esbuild/freebsd-arm64": "0.24.2",
+                "@esbuild/freebsd-x64": "0.24.2",
+                "@esbuild/linux-arm": "0.24.2",
+                "@esbuild/linux-arm64": "0.24.2",
+                "@esbuild/linux-ia32": "0.24.2",
+                "@esbuild/linux-loong64": "0.24.2",
+                "@esbuild/linux-mips64el": "0.24.2",
+                "@esbuild/linux-ppc64": "0.24.2",
+                "@esbuild/linux-riscv64": "0.24.2",
+                "@esbuild/linux-s390x": "0.24.2",
+                "@esbuild/linux-x64": "0.24.2",
+                "@esbuild/netbsd-arm64": "0.24.2",
+                "@esbuild/netbsd-x64": "0.24.2",
+                "@esbuild/openbsd-arm64": "0.24.2",
+                "@esbuild/openbsd-x64": "0.24.2",
+                "@esbuild/sunos-x64": "0.24.2",
+                "@esbuild/win32-arm64": "0.24.2",
+                "@esbuild/win32-ia32": "0.24.2",
+                "@esbuild/win32-x64": "0.24.2"
            }
        },
        "node_modules/escalade": {
@@ -11255,13 +11273,13 @@
            }
        },
        "node_modules/vite": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.5.tgz",
-            "integrity": "sha512-akD5IAH/ID5imgue2DYhzsEwCi0/4VKY31uhMLEYJwPP4TiUp8pL5PIK+Wo7H8qT8JY9i+pVfPydcFPYD1EL7g==",
+            "version": "6.0.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz",
+            "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "esbuild": "0.24.0",
+                "esbuild": "^0.24.2",
                "postcss": "^8.4.49",
                "rollup": "^4.23.0"
            },
--- a/resources/assets/v1/src/locales/de.json
+++ b/resources/assets/v1/src/locales/de.json
@@ -130,15 +130,15 @@
        "response": "Antwort",
        "visit_webhook_url": "Webhook-URL besuchen",
        "reset_webhook_secret": "Webhook Secret zur\u00fccksetzen",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+        "header_exchange_rates": "Wechselkurse",
+        "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in <a href=\u201ehttps:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\u201c>der Dokumentation<\/a>.",
+        "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)",
        "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates_rates": "Wechselkurse",
+        "header_exchange_rates_table": "Tabelle mit Wechselkursen",
+        "help_rate_form": "An diesem Tag, wie viele {to} werden Sie f\u00fcr {from} bekommen?",
+        "add_new_rate": "Neuen Wechselkurs hinzuf\u00fcgen",
+        "save_new_rate": "Neuen Kurs speichern"
    },
    "form": {
        "url": "URL",
@@ -158,7 +158,7 @@
        "webhook_delivery": "Zustellung",
        "from_currency_to_currency": "{from} &rarr; {to}",
        "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Kurs"
    },
    "list": {
        "active": "Aktiv?",
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -11,9 +11,15 @@
            <div class="box">
                <div class="box-header with-border">
                    <h3 class="box-title">
+                        {% if balances.balance %}
                        {{ trans('firefly.chart_account_in_period', {
-                            balance: formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true),
+                            balance: formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true),
                            name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
+                        {% elseif balances.native_balance %}
+                            {{ trans('firefly.chart_account_in_period', {
+                                balance: formatAmountBySymbol(balances.native_balance, defaultCurrency.symbol, defaultCurrency.decimal_places, true),
+                                name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }}
+                        {% endif %}
                    </h3>
                    <div class="box-tools pull-right">
                        <div class="btn-group">
@@ -140,7 +146,12 @@
            <div class="box">
                <div class="box-header with-border">
                    <h3 class="box-title">{{ 'transactions'|_ }}
-                        ({{ formatAmountBySymbol(balance, currency.symbol, currency.decimal_places, true)|raw }})</h3>
+                        {% if balances.balance %}
+                        ({{ formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true)|raw }})
+                        {% elseif balances.native_balance %}
+                            ({{ formatAmountBySymbol(balances.native_balance, defaultCurrency.symbol, defaultCurrency.decimal_places, true)|raw }})
+                        {% endif %}
+                    </h3>
                </div>
                <div class="box-body">
                    {% if account.accountType.type == 'Asset account' %}
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -27,7 +27,15 @@
                    <table class="table table-striped">
                        <tr>
                            <td colspan="2">
-                                {{ trans('firefly.match_between_amounts', {low: formatAmountByCurrency(object.data.currency,object.data.amount_min), high: formatAmountByCurrency(object.data.currency,object.data.amount_max) })|raw }}
+                                {% set lowAmount  = formatAmountByCurrency(object.data.currency,object.data.amount_min) %}
+                                {% set highAmount = formatAmountByCurrency(object.data.currency,object.data.amount_max) %}
+                                {% if(0 != object.data.native_amount_min) %}
+                                    {% set lowAmount = lowAmount ~ ' (' ~ formatAmountByCode(object.data.native_amount_min, defaultCurrency.code) ~ ')'  %}
+                                {% endif %}
+                                {% if(0 != object.data.native_amount_max) %}
+                                    {% set highAmount = highAmount ~ ' (' ~ formatAmountByCode(object.data.native_amount_max, defaultCurrency.code) ~ ')'  %}
+                                {% endif %}
+                                {{ trans('firefly.match_between_amounts', {low: lowAmount, high: highAmount })|raw }}
                                {{ 'repeats'|_ }}
                                {{ trans('firefly.repeat_freq_' ~object.data.repeat_freq) }}.
                            </td>
--- a/resources/views/list/accounts.twig
+++ b/resources/views/list/accounts.twig
@@ -67,11 +67,15 @@
            <td style="text-align: right;">
                <span style="margin-right:5px;">
                    {% for key, balance in account.endBalances %}
-                        {% if 'balance' == key or 'native_balance' == key %}
-                            {{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.currency.decimal_places)  }}
+                        <span title="{{ key }}">
+                        {% if 'balance' == key %}
+                            {{ formatAmountBySymbol(balance, account.currency.symbol, account.currency.decimal_places)  }}
+                        {% elseif 'native_balance' == key %}
+                            {{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.decimal_places)  }}
                        {% else %}
                            ({{ formatAmountByCode(balance, key)  }})
                        {% endif %}
+                        </span>
                    {% endfor %}
                </span>
            </td>
@@ -108,11 +112,14 @@
            <td class="hidden-sm hidden-xs hidden-md" style="text-align: right;">
                <span style="margin-right:5px;">
                    {% for key, balance in account.differences %}
+                        <span title="{{ key }}">
                        {% if 'balance' == key or 'native_balance' == key %}
-                            {{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.currency.decimal_places)  }}
+                            {{ formatAmountBySymbol(balance, account.currency.symbol, account.currency.currency.decimal_places)  }}
+
                        {% else %}
                            ({{ formatAmountByCode(balance, key)  }})
                        {% endif %}
+                            </span>
                    {% endfor %}
                </span>
            </td>
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -67,6 +67,10 @@
                      title="{{ formatAmountBySymbol(entry.amount_min, entry.currency_symbol, entry.currency_decimal_places, false)|escape }} -- {{ formatAmountBySymbol(entry.amount_max, entry.currency_symbol, entry.currency_decimal_places, false)|escape }}"
                >
                    ~ {{ formatAmountBySymbol((entry.amount_max + entry.amount_min)/2, entry.currency_symbol, entry.currency_decimal_places) }}
+
+                    {% if '0' != entry.native_amount_max %}
+                    ({{ formatAmountBySymbol((entry.native_amount_max + entry.native_amount_min)/2, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                    {% endif %}
                </span>
                    </td>

--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -59,14 +59,14 @@
                <td colspan="1" style="text-align:right;border-top:1px #aaa solid;">
                    {% for sum in group.sums %}
                        {% if group.transaction_type == 'Deposit' %}
-                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE group 1){% if loop.index != group.sums|length %},{% endif %}

                        {% elseif group.transaction_type == 'Transfer' %}
                            <span class="text-info money-transfer">
-                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}(TODO group 2 ){% if loop.index != group.sums|length %},{% endif %}
                            </span>
                        {% else %}
-                            {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %}
+                            {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE group 3){% if loop.index != group.sums|length %},{% endif %}
                        {% endif %}
                    {% endfor %}
                </td>
@@ -154,7 +154,9 @@
                        {% if null != transaction.foreign_amount %}
                            ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                        {% endif %}
-                        (TODO NATIVE1)
+                        {% if convertToNative and 0 != transaction.native_amount %}
+                            ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                        {% endif %}
                        {# transfer #}
                    {% elseif transaction.transaction_type_type == 'Transfer' %}
                        <span class="text-info money-transfer">
@@ -162,7 +164,9 @@
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                            {% endif %}
-                            (TODO NATIVE2)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                            </span>
                        {# opening balance #}
                    {% elseif transaction.transaction_type_type == 'Opening balance' %}
@@ -171,13 +175,17 @@
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE3)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% else %}
                            {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE4)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% endif %}
                        {# reconciliation #}
                    {% elseif transaction.transaction_type_type == 'Reconciliation' %}
@@ -186,13 +194,17 @@
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE5)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% else %}
                            {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE6)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% endif %}
                        {# liability credit #}
                    {% elseif transaction.transaction_type_type == 'Liability credit' %}
@@ -201,13 +213,17 @@
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE7)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% else %}
                            {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                            {% if null != transaction.foreign_amount %}
                                ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                            {% endif %}
-                            (TODO NATIVE8)
+                            {% if convertToNative and 0 != transaction.native_amount %}
+                                ({{ formatAmountBySymbol(transaction.native_amount*-1, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                            {% endif %}
                        {% endif %}


@@ -217,7 +233,9 @@
                        {% if null != transaction.foreign_amount %}
                            ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                        {% endif %}
-                        (TODO NATIVE9)
+                        {% if convertToNative and 0 != transaction.native_amount %}
+                            ({{ formatAmountBySymbol(transaction.native_amount, defaultCurrency.symbol, defaultCurrency.decimal_places) }})
+                        {% endif %}
                    {% endif %}
                </td>
                <td style=" {{ style|raw }}">
Author	SHA1	Message	Date
github-actions	71cf6c6a5e	Auto commit for release 'branch-v6.2' on 2024-12-26	2024-12-26 10:24:39 +01:00
James Cole	1e8f0adaf8	Fix broken account balance.	2024-12-26 10:20:40 +01:00
James Cole	33531244aa	Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2 # Conflicts: # app/Http/Controllers/Chart/AccountController.php # app/Support/Steam.php	2024-12-26 09:19:04 +01:00
James Cole	06049a9a28	Update various pages, clean up some code.	2024-12-26 09:16:17 +01:00
James Cole	d313f5fdf5	Fix chart balance.	2024-12-26 08:53:16 +01:00
github-actions	f4868126c1	Auto commit for release 'branch-v6.2' on 2024-12-26	2024-12-26 05:25:46 +01:00
James Cole	00147e98dd	Fix home chart.	2024-12-26 05:21:28 +01:00
James Cole	6d22663ca2	Fix charts and balances.	2024-12-26 05:11:32 +01:00
James Cole	756bb9cf5e	Fix overview, skip chart for now.	2024-12-25 11:59:15 +01:00
James Cole	399d7968f5	Fix another null.	2024-12-25 08:30:00 +01:00
James Cole	966b68f42e	Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2	2024-12-25 08:29:50 +01:00
James Cole	134c551c12	Remove some comments, add others.	2024-12-25 08:23:17 +01:00
github-actions	9aeca15355	Auto commit for release 'branch-v6.2' on 2024-12-25	2024-12-25 08:17:59 +01:00
James Cole	6c6d31830b	Fix nullpointer	2024-12-25 08:14:07 +01:00