Auto commit for release 'develop' on 2025-01-20

# Conflicts:
#	app/Transformers/CurrencyTransformer.php
#	app/Transformers/V2/CurrencyTransformer.php

.ci/phpstan.neon

@@ -16,6 +16,9 @@ parameters:
     - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
     - identifier: varTag.nativeType
     - identifier: varTag.type
+    -
+        identifier: larastan.noEnvCallsOutsideOfConfig
+        path: ../app/Console/Commands/System/CreatesDatabase.php
     - identifier: missingType.iterableValue # not interesting enough to fix.
     - identifier: missingType.generics # not interesting enough to fix.
     - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
@@ -28,49 +31,6 @@ parameters:
     - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#'
     - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#'
     - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#'
-    # - '#Control structures using switch should not be used.#' # switch is fine in some cases.
-    # - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    # - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    # - '#is not allowed to extend#'
-    # - '#does not specify its types#'
-    # - '#switch is forbidden to use#'
-    # - '#is neither abstract nor final#'
-    # - '#on left side of \?\?\= always exists and is not nullable#'
-    # - '#has a nullable return type declaration#' # perhaps throw errors instead?
-    # - '#with a nullable type declaration#' # decide what action should be if param is null.
-    # - '#with null as default value#'
-    # -
-    #     message: '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
-    #     paths:
-    #         - ../app/Exceptions/IntervalException.php
-    #         - ../app/Support/Navigation.php
-    # -
-    #     message: '#but containers should not be injected#'
-    #     paths:
-    #         - ../app/Support/Authentication/RemoteUserGuard.php
-    # -
-    #     message: '#Function compact\(\) should not be used#' # too useful in template rendering.
-    #     paths:
-    #         - ../app/Generator/Report/Account/MonthReportGenerator.php
-    #         - ../app/Generator/Report/Audit/MonthReportGenerator.php
-    #         - ../app/Generator/Report/Budget/MonthReportGenerator.php
-    #         - ../app/Generator/Report/Category/MonthReportGenerator.php
-    #         - ../app/Generator/Report/Standard/MonthReportGenerator.php
-    #         - ../app/Generator/Report/Standard/MultiYearReportGenerator.php
-    #         - ../app/Generator/Report/Standard/YearReportGenerator.php
-    #         - ../app/Generator/Report/Tag/MonthReportGenerator.php
-    #         - ../app/Http/Controllers/Account/*.php
-    #         - ../app/Http/Controllers/Admin/*.php
-    #         - ../app/Http/Controllers/*.php
-    #         - ../app/Support/ExpandedForm.php
-    #         - ../app/Support/Form/AccountForm.php
-    #         - ../app/Support/Form/CurrencyForm.php
-    #         - ../app/Support/Form/FormSupport.php
-    # -
-    #     message: '#Either catch a more specific exception#'
-    #     paths:
-    #         - ../app/Support/Form/FormSupport.php
-
 
   # The level 8 is the highest level. original was 5
   # 7 is more than enough, higher just leaves NULL things.

app/Api/V1/Controllers/Controller.php

@@ -80,7 +80,7 @@ abstract class Controller extends BaseController
                 if (auth()->check()) {
                     $language              = Steam::getLanguage();
                     $this->convertToNative = Amount::convertToNative();
-                    $this->defaultCurrency = Amount::getDefaultCurrency();
+                    $this->defaultCurrency = Amount::getNativeCurrency();
                     app()->setLocale($language);
 
                 }

app/Api/V1/Controllers/Insight/Expense/BillController.php

@@ -70,7 +70,7 @@ class BillController extends Controller
         $start           = $request->getStart();
         $end             = $request->getEnd();
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
         $response        = [];
 
         // get all bills:
@@ -133,7 +133,7 @@ class BillController extends Controller
         $start           = $request->getStart();
         $end             = $request->getEnd();
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
         $response        = [];
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.

app/Api/V1/Controllers/Insight/Expense/PeriodController.php

@@ -48,7 +48,7 @@ class PeriodController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
         $collector       = app(GroupCollectorInterface::class);

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -69,7 +69,7 @@ class TagController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector       = app(GroupCollectorInterface::class);

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -47,7 +47,7 @@ class PeriodController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
         $collector       = app(GroupCollectorInterface::class);

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -69,7 +69,7 @@ class TagController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector       = app(GroupCollectorInterface::class);

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -47,7 +47,7 @@ class PeriodController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
         $collector       = app(GroupCollectorInterface::class);

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -67,7 +67,7 @@ class TagController extends Controller
         $end             = $request->getEnd();
         $response        = [];
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
 
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.

app/Api/V1/Controllers/Summary/BasicController.php

@@ -124,7 +124,7 @@ class BasicController extends Controller
     {
         // some config settings
         $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
         // prep some arrays:
         $incomes         = [];
         $expenses        = [];

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

@@ -55,7 +55,7 @@ class AccountController extends Controller
                 $userGroup        = $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUserGroup($userGroup);
-                $this->default    = app('amount')->getDefaultCurrency();
+                $this->default    = app('amount')->getNativeCurrency();
                 $this->converter  = app(ExchangeRateConverter::class);
 
                 return $next($request);

app/Api/V2/Controllers/Chart/AccountController.php

@@ -57,7 +57,7 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUserGroup($this->validateUserGroup($request));
                 $this->chartData  = new ChartData();
-                $this->default    = app('amount')->getDefaultCurrency();
+                $this->default    = app('amount')->getNativeCurrency();
 
                 return $next($request);
             }

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

@@ -62,7 +62,7 @@ class BalanceController extends Controller
                 $this->repository->setUserGroup($userGroup);
                 $this->collector->setUserGroup($userGroup);
                 $this->chartData  = new ChartData();
-                // $this->default    = app('amount')->getDefaultCurrency();
+                // $this->default    = app('amount')->getNativeCurrency();
 
                 return $next($request);
             }
@@ -87,7 +87,7 @@ class BalanceController extends Controller
 
         // prepare for currency conversion and data collection:
         /** @var TransactionCurrency $default */
-        $default         = app('amount')->getDefaultCurrency();
+        $default         = app('amount')->getNativeCurrency();
 
         // get journals for entire period:
 

app/Api/V2/Controllers/Chart/BudgetController.php

@@ -63,7 +63,7 @@ class BudgetController extends Controller
                 $this->repository    = app(BudgetRepositoryInterface::class);
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->currency      = app('amount')->getDefaultCurrency();
+                $this->currency      = app('amount')->getNativeCurrency();
                 $userGroup           = $this->validateUserGroup($request);
                 $this->repository->setUserGroup($userGroup);
                 $this->opsRepository->setUserGroup($userGroup);

app/Api/V2/Controllers/Chart/CategoryController.php

@@ -82,7 +82,7 @@ class CategoryController extends Controller
         /** @var Carbon $end */
         $end        = $this->parameters->get('end');
         $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);
-        $default    = app('amount')->getDefaultCurrency();
+        $default    = app('amount')->getNativeCurrency();
         $converter  = new ExchangeRateConverter();
         $currencies = [];
         $return     = [];

app/Api/V2/Controllers/Summary/BasicController.php

@@ -118,7 +118,7 @@ class BasicController extends Controller
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
         $object    = new SummaryBalanceGrouped();
-        $default   = app('amount')->getDefaultCurrency();
+        $default   = app('amount')->getNativeCurrency();
 
         $object->setDefault($default);
 
@@ -233,7 +233,7 @@ class BasicController extends Controller
         $available    = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
         $budgets      = $this->budgetRepository->getActiveBudgets();
         $spent        = $this->opsRepository->listExpenses($start, $end, null, $budgets);
-        $default      = app('amount')->getDefaultCurrency();
+        $default      = app('amount')->getNativeCurrency();
         $currencies   = [];
         $converter    = new ExchangeRateConverter();
 

app/Console/Commands/Correction/CorrectsCurrencies.php

@@ -63,7 +63,7 @@ class CorrectsCurrencies extends Command
         $repos           = app(CurrencyRepositoryInterface::class);
 
         // first check if the user has any default currency (not necessarily the case, so can be forced).
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($userGroup);
 
         Log::debug(sprintf('Now correcting currencies for user group #%d', $userGroup->id));
         $found           = [$defaultCurrency->id];

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -88,7 +88,7 @@ class CorrectsNativeAmounts extends Command
 
         // do a check with the group's currency so we can skip some stuff.
         Preferences::mark();
-        $currency = app('amount')->getDefaultCurrencyByUserGroup($userGroup);
+        $currency = app('amount')->getNativeCurrencyByUserGroup($userGroup);
 
         $this->recalculatePiggyBanks($userGroup, $currency);
         $this->recalculateBudgets($userGroup, $currency);

app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php

@@ -132,6 +132,6 @@ class CorrectsOpeningBalanceCurrencies extends Command
         $repos = app(AccountRepositoryInterface::class);
         $repos->setUser($account->user);
 
-        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUserGroup($account->userGroup);
+        return $repos->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUserGroup($account->userGroup);
     }
 }

app/Console/Commands/System/CreatesDatabase.php

@@ -38,7 +38,7 @@ class CreatesDatabase extends Command
 
     public function handle(): int
     {
-        if ('mysql' !== env('DB_CONNECTION')) {
+        if ('mysql' !== env('DB_CONNECTION')) { // @phpstan-ignore larastan.noEnvCallsOutsideOfConfig */
             $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
 
             return 0;
@@ -60,7 +60,7 @@ class CreatesDatabase extends Command
 
         // when it fails, display error
         try {
-            $pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
+            $pdo = new \PDO($dsn, (string) env('DB_USERNAME'), (string) env('DB_PASSWORD'), $options);
         } catch (\PDOException $e) {
             $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
 

app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php

@@ -107,7 +107,7 @@ class UpgradesAccountCurrencies extends Command
         $accounts        = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value]);
 
         // get user's currency preference:
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);
 
         /** @var Account $account */
         foreach ($accounts as $account) {

app/Console/Commands/Upgrade/UpgradesBudgetLimits.php

@@ -66,7 +66,7 @@ class UpgradesBudgetLimits extends Command
                     /** @var null|User $user */
                     $user = $budget->user;
                     if (null !== $user) {
-                        $currency                             = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+                        $currency                             = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);
                         $budgetLimit->transaction_currency_id = $currency->id;
                         $budgetLimit->save();
                         $this->friendlyInfo(

app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php

@@ -90,7 +90,7 @@ class UpgradesMultiPiggyBanks extends Command
         $this->repository->setUser($piggyBank->account->user);
         $this->accountRepository->setUser($piggyBank->account->user);
         $repetition                         = $this->repository->getRepetition($piggyBank, true);
-        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrencyByUserGroup($piggyBank->account->user->userGroup);
+        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getNativeCurrencyByUserGroup($piggyBank->account->user->userGroup);
 
         // update piggy bank to have a currency.
         $piggyBank->transaction_currency_id = $currency->id;

app/Factory/BillFactory.php

@@ -49,7 +49,7 @@ class BillFactory
         app('log')->debug(sprintf('Now in %s', __METHOD__), $data);
         $factory          = app(TransactionCurrencyFactory::class);
         $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null)) ??
-                    app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+                    app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         try {
             $skip   = array_key_exists('skip', $data) ? $data['skip'] : 0;

app/Factory/PiggyBankFactory.php

@@ -121,7 +121,7 @@ class PiggyBankFactory
     private function getCurrency(array $data): TransactionCurrency
     {
         // currency:
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $defaultCurrency = app('amount')->getNativeCurrency();
         $currency        = null;
         if (array_key_exists('transaction_currency_code', $data)) {
             $currency = $this->currencyRepository->findByCode((string) ($data['transaction_currency_code'] ?? ''));

app/Factory/TransactionJournalFactory.php

@@ -466,7 +466,7 @@ class TransactionJournalFactory
         $preference = $this->accountRepository->getAccountCurrency($account);
         if (null === $preference && null === $currency) {
             // return user's default:
-            return app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            return app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
         $result     = $preference ?? $currency;
         app('log')->debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name));

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -135,7 +135,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $journals          = array_reverse($journals, true);
         $dayBeforeBalance  = Steam::finalAccountBalance($account, $date);
         $startBalance      = $dayBeforeBalance['balance'];
-        $defaultCurrency   = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+        $defaultCurrency   = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         $currency          = $accountRepository->getAccountCurrency($account) ?? $defaultCurrency;
 
         foreach ($journals as $index => $journal) {

app/Handlers/Observer/AccountObserver.php

@@ -47,7 +47,7 @@ class AccountObserver
         if (!Amount::convertToNative($account->user)) {
             return;
         }
-        $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+        $userCurrency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         $repository   = app(AccountRepositoryInterface::class);
         $currency     = $repository->getAccountCurrency($account);
         if (null !== $currency && $currency->id !== $userCurrency->id && '' !== (string) $account->virtual_balance && 0 !== bccomp($account->virtual_balance, '0')) {

app/Handlers/Observer/AutoBudgetObserver.php

@@ -48,7 +48,7 @@ class AutoBudgetObserver
         if (!Amount::convertToNative($autoBudget->budget->user)) {
             return;
         }
-        $userCurrency              = app('amount')->getDefaultCurrencyByUserGroup($autoBudget->budget->user->userGroup);
+        $userCurrency              = app('amount')->getNativeCurrencyByUserGroup($autoBudget->budget->user->userGroup);
         $autoBudget->native_amount = null;
         if ($autoBudget->transactionCurrency->id !== $userCurrency->id) {
             $converter                 = new ExchangeRateConverter();

app/Handlers/Observer/AvailableBudgetObserver.php

@@ -50,7 +50,7 @@ class AvailableBudgetObserver
 
             return;
         }
-        $userCurrency                   = app('amount')->getDefaultCurrencyByUserGroup($availableBudget->user->userGroup);
+        $userCurrency                   = app('amount')->getNativeCurrencyByUserGroup($availableBudget->user->userGroup);
         $availableBudget->native_amount = null;
         if ($availableBudget->transactionCurrency->id !== $userCurrency->id) {
             $converter                      = new ExchangeRateConverter();

app/Handlers/Observer/BillObserver.php

@@ -59,7 +59,7 @@ class BillObserver
         if (!Amount::convertToNative($bill->user)) {
             return;
         }
-        $userCurrency            = app('amount')->getDefaultCurrencyByUserGroup($bill->user->userGroup);
+        $userCurrency            = app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup);
         $bill->native_amount_min = null;
         $bill->native_amount_max = null;
         if ($bill->transactionCurrency->id !== $userCurrency->id) {

app/Handlers/Observer/BudgetLimitObserver.php

@@ -50,7 +50,7 @@ class BudgetLimitObserver
 
             return;
         }
-        $userCurrency               = app('amount')->getDefaultCurrencyByUserGroup($budgetLimit->budget->user->userGroup);
+        $userCurrency               = app('amount')->getNativeCurrencyByUserGroup($budgetLimit->budget->user->userGroup);
         $budgetLimit->native_amount = null;
         if ($budgetLimit->transactionCurrency->id !== $userCurrency->id) {
             $converter                  = new ExchangeRateConverter();

app/Handlers/Observer/PiggyBankEventObserver.php

@@ -48,7 +48,7 @@ class PiggyBankEventObserver
         if (!Amount::convertToNative($event->piggyBank->accounts()->first()->user)) {
             return;
         }
-        $userCurrency         = app('amount')->getDefaultCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
+        $userCurrency         = app('amount')->getNativeCurrencyByUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
         $event->native_amount = null;
         if ($event->piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter            = new ExchangeRateConverter();

app/Handlers/Observer/PiggyBankObserver.php

@@ -70,7 +70,7 @@ class PiggyBankObserver
 
             return;
         }
-        $userCurrency                    = app('amount')->getDefaultCurrencyByUserGroup($group);
+        $userCurrency                    = app('amount')->getNativeCurrencyByUserGroup($group);
         $piggyBank->native_target_amount = null;
         if ($piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter                       = new ExchangeRateConverter();

app/Handlers/Observer/TransactionObserver.php

@@ -71,7 +71,7 @@ class TransactionObserver
         if (!Amount::convertToNative($transaction->transactionJournal->user)) {
             return;
         }
-        $userCurrency                       = app('amount')->getDefaultCurrencyByUserGroup($transaction->transactionJournal->user->userGroup);
+        $userCurrency                       = app('amount')->getNativeCurrencyByUserGroup($transaction->transactionJournal->user->userGroup);
         $transaction->native_amount         = null;
         $transaction->native_foreign_amount = null;
         // first normal amount

app/Helpers/Report/NetWorth.php

@@ -77,7 +77,7 @@ class NetWorth implements NetWorthInterface
             return $cache->get();
         }
         Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
         $netWorth        = [];
         $balances        = Steam::finalAccountsBalance($accounts, $date);
 

app/Http/Controllers/Controller.php

@@ -118,7 +118,7 @@ abstract class Controller extends BaseController
                 $this->defaultCurrency   =null;
                 // get shown-intro-preference:
                 if (auth()->check()) {
-                    $this->defaultCurrency   = Amount::getDefaultCurrency();
+                    $this->defaultCurrency   = Amount::getNativeCurrency();
                     $language  = Steam::getLanguage();
                     $locale    = Steam::getLocale();
                     $darkMode  = app('preferences')->get('darkMode', 'browser')->data;

app/Http/Controllers/UserGroup/EditController.php

@@ -42,8 +42,6 @@ class EditController extends Controller
         $mainTitleIcon = 'fa-book';
         app('log')->debug(sprintf('Now at %s', __METHOD__));
 
-        return view('administrations.edit')  // @phpstan-ignore-line
-            ->with(compact('title', 'subTitle', 'mainTitleIcon'))
-        ;
+        return view('administrations.edit')->with(compact('title', 'subTitle', 'mainTitleIcon'));
     }
 }

app/Http/Middleware/InterestingMessage.php

@@ -159,6 +159,7 @@ class InterestingMessage
         /** @var User $user */
         $user        = auth()->user();
 
+        /** @var null|UserGroup $userGroup */
         $userGroup   = UserGroup::find($userGroupId);
         $valid       = false;
         $memberships = $user->groupMemberships()->get();

app/Http/Middleware/Range.php

@@ -118,7 +118,7 @@ class Range
         // save some formats:
         $monthAndDayFormat = (string) trans('config.month_and_day_js', [], $locale);
         $dateTimeFormat    = (string) trans('config.date_time_js', [], $locale);
-        $defaultCurrency   = Amount::getDefaultCurrency();
+        $defaultCurrency   = Amount::getNativeCurrency();
 
         // also format for moment JS:
         $madMomentJS       = (string) trans('config.month_and_day_moment_js', [], $locale);

app/Http/Requests/PiggyBankStoreRequest.php

@@ -126,7 +126,7 @@ class PiggyBankStoreRequest extends FormRequest
         $currencyId = (int) ($data['transaction_currency_id'] ?? 0);
         $currency   = TransactionCurrency::find($currencyId);
         if (null === $currency) {
-            return Amount::getDefaultCurrency();
+            return Amount::getNativeCurrency();
         }
 
         return $currency;

app/Http/Requests/PiggyBankUpdateRequest.php

@@ -129,7 +129,7 @@ class PiggyBankUpdateRequest extends FormRequest
         $currencyId = (int) ($data['transaction_currency_id'] ?? 0);
         $currency   = TransactionCurrency::find($currencyId);
         if (null === $currency) {
-            return Amount::getDefaultCurrency();
+            return Amount::getNativeCurrency();
         }
 
         return $currency;

app/Models/TransactionCurrency.php

@@ -73,7 +73,7 @@ class TransactionCurrency extends Model
     public function refreshForUser(User $user): void
     {
         $current                = $user->userGroup->currencies()->where('transaction_currencies.id', $this->id)->first();
-        $native                 = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+        $native                 = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);
         $this->userGroupNative  = $native->id === $this->id;
         $this->userGroupEnabled = null !== $current;
     }

app/Repositories/Account/AccountRepository.php

@@ -355,7 +355,7 @@ class AccountRepository implements AccountRepositoryInterface
         if (AccountTypeEnum::ASSET->value !== $account->accountType->type) {
             throw new FireflyException(sprintf('%s is not an asset account.', $account->name));
         }
-        $currency = $this->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
+        $currency = $this->getAccountCurrency($account) ?? app('amount')->getNativeCurrency();
         $name     = trans('firefly.reconciliation_account_name', ['name' => $account->name, 'currency' => $currency->code]);
 
         /** @var AccountType $type */

app/Repositories/Account/AccountTasker.php

@@ -53,7 +53,7 @@ class AccountTasker implements AccountTaskerInterface
 
         /** @var AccountRepositoryInterface $repository */
         $repository      = app(AccountRepositoryInterface::class);
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         $return          = [
             'accounts' => [],
@@ -143,7 +143,7 @@ class AccountTasker implements AccountTaskerInterface
      */
     private function groupExpenseByDestination(array $array): array
     {
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         /** @var CurrencyRepositoryInterface $currencyRepos */
         $currencyRepos   = app(CurrencyRepositoryInterface::class);
@@ -231,7 +231,7 @@ class AccountTasker implements AccountTaskerInterface
      */
     private function groupIncomeBySource(array $array): array
     {
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         /** @var CurrencyRepositoryInterface $currencyRepos */
         $currencyRepos   = app(CurrencyRepositoryInterface::class);

app/Repositories/Bill/BillRepository.php

@@ -275,7 +275,7 @@ class BillRepository implements BillRepositoryInterface
             ];
             $result[$currencyId]['sum']        = bcadd($result[$currencyId]['sum'], $transaction->amount);
             $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->native_amount ?? '0');
-            if ($journal->foreign_currency_id === Amount::getDefaultCurrency()->id) {
+            if ($journal->foreign_currency_id === Amount::getNativeCurrency()->id) {
                 $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->amount);
             }
             ++$result[$currencyId]['count'];
@@ -406,7 +406,7 @@ class BillRepository implements BillRepositoryInterface
             ];
             $result[$currencyId]['sum']        = bcadd($result[$currencyId]['sum'], $transaction->amount);
             $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->native_amount ?? '0');
-            if ($journal->foreign_currency_id === Amount::getDefaultCurrency()->id) {
+            if ($journal->foreign_currency_id === Amount::getNativeCurrency()->id) {
                 $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->amount);
             }
             ++$result[$currencyId]['count'];
@@ -530,7 +530,7 @@ class BillRepository implements BillRepositoryInterface
         $bills           = $this->getActiveBills();
         $return          = [];
         $convertToNative = Amount::convertToNative($this->user);
-        $default         = app('amount')->getDefaultCurrency();
+        $default         = app('amount')->getNativeCurrency();
 
         /** @var Bill $bill */
         foreach ($bills as $bill) {
@@ -575,7 +575,7 @@ class BillRepository implements BillRepositoryInterface
         $bills           = $this->getActiveBills();
         $return          = [];
         $convertToNative = Amount::convertToNative($this->user);
-        $default         = app('amount')->getDefaultCurrency();
+        $default         = app('amount')->getNativeCurrency();
 
         /** @var Bill $bill */
         foreach ($bills as $bill) {

app/Repositories/Budget/AvailableBudgetRepository.php

@@ -142,7 +142,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
 
         // use native amount if necessary?
         $convertToNative  = Amount::convertToNative($this->user);
-        $default          = Amount::getDefaultCurrency();
+        $default          = Amount::getNativeCurrency();
 
         /** @var AvailableBudget $availableBudget */
         foreach ($availableBudgets as $availableBudget) {

app/Repositories/Budget/BudgetLimitRepository.php

@@ -279,7 +279,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         $factory                        = app(TransactionCurrencyFactory::class);
         $currency                       = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
         $currency->enabled              = true;
         $currency->save();
@@ -377,7 +377,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
         }
         // catch unexpected null:
         if (null === $currency) {
-            $currency = $budgetLimit->transactionCurrency ?? app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            $currency = $budgetLimit->transactionCurrency ?? app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
         $currency->enabled                    = true;
         $currency->save();

app/Repositories/Budget/BudgetRepository.php

@@ -89,7 +89,7 @@ class BudgetRepository implements BudgetRepositoryInterface
         $limitRepository = app(BudgetLimitRepository::class);
         $limitRepository->setUser($this->user);
         $budgets         = $this->getActiveBudgets();
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $defaultCurrency = app('amount')->getNativeCurrency();
         $converter       = new ExchangeRateConverter();
 
         /** @var Budget $budget */
@@ -396,7 +396,7 @@ class BudgetRepository implements BudgetRepositoryInterface
         $autoBudget = $this->getAutoBudget($budget);
 
         // grab default currency:
-        $currency   = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $currency   = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         if (null === $autoBudget) {
             // at this point it's a blind assumption auto_budget_type is 1 or 2.
@@ -782,7 +782,7 @@ class BudgetRepository implements BudgetRepositoryInterface
             $currency = $repos->findByCode((string) $data['currency_code']);
         }
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
 
         $autoBudget                          = new AutoBudget();

app/Repositories/Category/OperationsRepository.php

@@ -364,7 +364,7 @@ class OperationsRepository implements OperationsRepositoryInterface
         $collector->setCategories($categories);
         $journals        = $collector->getExtractedJournals();
         $convertToNative = Amount::convertToNative($this->user);
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
         $array           = [];
 
         foreach ($journals as $journal) {

app/Repositories/PiggyBank/ModifiesPiggyBanks.php

@@ -68,7 +68,7 @@ trait ModifiesPiggyBanks
         $pivot->native_current_amount = null;
 
         // also update native_current_amount.
-        $userCurrency                 = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $userCurrency                 = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         if ($userCurrency->id !== $piggyBank->transaction_currency_id) {
             $converter                    = new ExchangeRateConverter();
             $converter->setIgnoreSettings(true);
@@ -91,7 +91,7 @@ trait ModifiesPiggyBanks
         $pivot->native_current_amount = null;
 
         // also update native_current_amount.
-        $userCurrency                 = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $userCurrency                 = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         if ($userCurrency->id !== $piggyBank->transaction_currency_id) {
             $converter                    = new ExchangeRateConverter();
             $converter->setIgnoreSettings(true);

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -150,7 +150,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
         $accountRepos    = app(AccountRepositoryInterface::class);
         $accountRepos->setUser($this->user);
 
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
 
         app('log')->debug(sprintf('Piggy bank #%d currency is %s', $piggyBank->id, $piggyBank->transactionCurrency->code));
 

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -345,7 +345,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
     {
         $return   = [];
         $journals = $group->transactionJournals->pluck('id')->toArray();
-        $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         $data     = PiggyBankEvent::whereIn('transaction_journal_id', $journals)
             ->with('piggyBank', 'piggyBank.account')
             ->get(['piggy_bank_events.*'])

app/Repositories/UserGroups/Bill/BillRepository.php

@@ -69,7 +69,7 @@ class BillRepository implements BillRepositoryInterface
     {
         Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $bills     = $this->getActiveBills();
-        $default   = app('amount')->getDefaultCurrency();
+        $default   = app('amount')->getNativeCurrency();
         $return    = [];
         $converter = new ExchangeRateConverter();
 
@@ -139,7 +139,7 @@ class BillRepository implements BillRepositoryInterface
         Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $bills     = $this->getActiveBills();
         $return    = [];
-        $default   = app('amount')->getDefaultCurrency();
+        $default   = app('amount')->getNativeCurrency();
         $converter = new ExchangeRateConverter();
 
         /** @var Bill $bill */

app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php

@@ -42,7 +42,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
         Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $return           = [];
         $converter        = new ExchangeRateConverter();
-        $default          = app('amount')->getDefaultCurrency();
+        $default          = app('amount')->getNativeCurrency();
         $availableBudgets = $this->userGroup->availableBudgets()
             ->where('start_date', $start->format('Y-m-d'))
             ->where('end_date', $end->format('Y-m-d'))->get()

app/Repositories/UserGroups/Currency/CurrencyRepository.php

@@ -245,7 +245,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
             app('log')->debug('Grabbing default currency for this user...');
 
             /** @var null|TransactionCurrency $result */
-            $result = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            $result = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
 
         app('log')->debug(sprintf('Final result: %s', $result->code));
@@ -376,7 +376,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
 
     public function makeDefault(TransactionCurrency $currency): void
     {
-        $current = app('amount')->getDefaultCurrencyByUserGroup($this->userGroup);
+        $current = app('amount')->getNativeCurrencyByUserGroup($this->userGroup);
         app('log')->debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id));
         $this->userGroup->currencies()->detach($currency->id);
         foreach ($this->userGroup->currencies()->get() as $item) {

app/Services/Internal/Support/AccountServiceTrait.php

@@ -233,7 +233,7 @@ trait AccountServiceTrait
         // get or grab currency:
         $currency   = $this->accountRepository->getAccountCurrency($account);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         }
 
         // submit to factory:
@@ -351,7 +351,7 @@ trait AccountServiceTrait
 
         if (null === $currency) {
             // use default currency:
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
         }
         $currency->enabled = true;
         $currency->save();
@@ -391,7 +391,7 @@ trait AccountServiceTrait
         // if exists, update:
         $currency                                    = $this->accountRepository->getAccountCurrency($account);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         }
 
         // simply grab the first journal and change it:
@@ -457,7 +457,7 @@ trait AccountServiceTrait
         // get or grab currency:
         $currency   = $this->accountRepository->getAccountCurrency($account);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         }
 
         // submit to factory:
@@ -573,7 +573,7 @@ trait AccountServiceTrait
         // if exists, update:
         $currency           = $this->accountRepository->getAccountCurrency($account);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         }
 
         // simply grab the first journal and change it:
@@ -654,7 +654,7 @@ trait AccountServiceTrait
         // get or grab currency:
         $currency   = $this->accountRepository->getAccountCurrency($account);
         if (null === $currency) {
-            $currency = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+            $currency = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         }
 
         // submit to factory:

app/Services/Internal/Support/RecurringTransactionTrait.php

@@ -107,7 +107,7 @@ trait RecurringTransactionTrait
             $currency        = $factory->find($array['currency_id'] ?? null, $array['currency_code'] ?? null);
             $foreignCurrency = $factory->find($array['foreign_currency_id'] ?? null, $array['foreign_currency_code'] ?? null);
             if (null === $currency) {
-                $currency = app('amount')->getDefaultCurrencyByUserGroup($recurrence->user->userGroup);
+                $currency = app('amount')->getNativeCurrencyByUserGroup($recurrence->user->userGroup);
             }
 
             app('log')->debug(

app/Services/Internal/Update/BillUpdateService.php

@@ -55,7 +55,7 @@ class BillUpdateService
         if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
             $factory                       = app(TransactionCurrencyFactory::class);
             $currency                      = $factory->find((int) ($data['currency_id'] ?? null), $data['currency_code'] ?? null) ??
-                        app('amount')->getDefaultCurrencyByUserGroup($bill->user->userGroup);
+                        app('amount')->getNativeCurrencyByUserGroup($bill->user->userGroup);
 
             // enable the currency if it isn't.
             $currency->enabled             = true;

app/Support/Amount.php

@@ -55,7 +55,7 @@ class Amount
     public function getAmountFromJournal(array $journal): string
     {
         $convertToNative = $this->convertToNative();
-        $currency        = $this->getDefaultCurrency();
+        $currency        = $this->getNativeCurrency();
         $field           = $convertToNative && $currency->id !== $journal['currency_id'] ? 'native_amount' : 'amount';
         $amount          = $journal[$field] ?? '0';
         // Log::debug(sprintf('Field is %s, amount is %s', $field, $amount));
@@ -86,7 +86,7 @@ class Amount
     public function getAmountFromJournalObject(TransactionJournal $journal): string
     {
         $convertToNative   = $this->convertToNative();
-        $currency          = $this->getDefaultCurrency();
+        $currency          = $this->getNativeCurrency();
         $field             = $convertToNative && $currency->id !== $journal->transaction_currency_id ? 'native_amount' : 'amount';
 
         /** @var null|Transaction $sourceTransaction */
@@ -155,13 +155,21 @@ class Amount
         return $user->currencies()->orderBy('code', 'ASC')->get();
     }
 
+    /**
+     * @deprecated
+     */
     public function getDefaultCurrency(): TransactionCurrency
+    {
+        return $this->getNativeCurrency();
+    }
+
+    public function getNativeCurrency(): TransactionCurrency
     {
         if (auth()->check()) {
             /** @var User $user */
             $user = auth()->user();
             if (null !== $user->userGroup) {
-                return $this->getDefaultCurrencyByUserGroup($user->userGroup);
+                return $this->getNativeCurrencyByUserGroup($user->userGroup);
             }
         }
 
@@ -185,7 +193,7 @@ class Amount
             return $cache->get();
         }
 
-        /** @var null|TransactionCurrency $default */
+        /** @var null|TransactionCurrency $native */
         $native = $userGroup->currencies()->where('group_default', true)->first();
         if (null === $native) {
             $native = $this->getSystemCurrency();

app/Support/Export/ExportDataGenerator.php

@@ -736,7 +736,7 @@ class ExportDataGenerator
 
         $metaFields = config('firefly.journal_meta_fields');
         $header     = array_merge($header, $metaFields);
-        $default    = Amount::getDefaultCurrency();
+        $default    = Amount::getNativeCurrency();
 
         $collector  = app(GroupCollectorInterface::class);
         $collector->setUser($this->user);
@@ -758,22 +758,22 @@ class ExportDataGenerator
             $metaData            = $repository->getMetaFields($journal['transaction_journal_id'], $metaFields);
             $amount              = Steam::bcround(Steam::negative($journal['amount']), $journal['currency_decimal_places']);
             $foreignAmount       = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['foreign_amount']), $journal['foreign_currency_decimal_places']);
-            $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount'], $default->decimal_places));
-            $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount'], $default->decimal_places));
+            $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount']), $default->decimal_places);
+            $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount']), $default->decimal_places);
 
             if (TransactionTypeEnum::WITHDRAWAL->value !== $journal['transaction_type_type']) {
                 $amount              = Steam::bcround(Steam::positive($journal['amount']), $journal['currency_decimal_places']);
                 $foreignAmount       = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['foreign_amount']), $journal['foreign_currency_decimal_places']);
-                $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::positive($journal['native_amount'], $default->decimal_places));
-                $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['native_foreign_amount'], $default->decimal_places));
+                $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::positive($journal['native_amount']), $default->decimal_places);
+                $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::positive($journal['native_foreign_amount']), $default->decimal_places);
             }
 
             // opening balance depends on source account type.
             if (TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type'] && AccountTypeEnum::ASSET->value === $journal['source_account_type']) {
                 $amount              = Steam::bcround(Steam::negative($journal['amount']), $journal['currency_decimal_places']);
                 $foreignAmount       = null === $journal['foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['foreign_amount']), $journal['foreign_currency_decimal_places']);
-                $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount'], $default->decimal_places));
-                $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount'], $default->decimal_places));
+                $nativeAmount        = null === $journal['native_amount'] ? null : Steam::bcround(Steam::negative($journal['native_amount']), $default->decimal_places);
+                $nativeForeignAmount = null === $journal['native_foreign_amount'] ? null : Steam::bcround(Steam::negative($journal['native_foreign_amount']), $default->decimal_places);
             }
 
             $records[]           = [

app/Support/Form/CurrencyForm.php

@@ -60,7 +60,7 @@ class CurrencyForm
         $classes         = $this->getHolderClasses($name);
         $value           = $this->fillFieldValue($name, $value);
         $options['step'] = 'any';
-        $defaultCurrency = $options['currency'] ?? app('amount')->getDefaultCurrency();
+        $defaultCurrency = $options['currency'] ?? app('amount')->getNativeCurrency();
 
         /** @var Collection $currencies */
         $currencies      = app('amount')->getCurrencies();
@@ -128,7 +128,7 @@ class CurrencyForm
         $classes         = $this->getHolderClasses($name);
         $value           = $this->fillFieldValue($name, $value);
         $options['step'] = 'any';
-        $defaultCurrency = $options['currency'] ?? app('amount')->getDefaultCurrency();
+        $defaultCurrency = $options['currency'] ?? app('amount')->getNativeCurrency();
 
         /** @var Collection $currencies */
         $currencies      = app('amount')->getAllCurrencies();

app/Support/Http/Controllers/ChartGeneration.php

@@ -66,7 +66,7 @@ trait ChartGeneration
         /** @var AccountRepositoryInterface $accountRepos */
         $accountRepos    = app(AccountRepositoryInterface::class);
 
-        $default         = app('amount')->getDefaultCurrency();
+        $default         = app('amount')->getNativeCurrency();
         $chartData       = [];
 
         /** @var Account $account */

app/Support/JsonApi/Enrichments/AccountEnrichment.php

@@ -82,7 +82,7 @@ class AccountEnrichment implements EnrichmentInterface
         Log::debug(sprintf('Now doing account enrichment for %d account(s)', $collection->count()));
         // prep local fields
         $this->collection   = $collection;
-        $this->default      = app('amount')->getDefaultCurrency();
+        $this->default      = app('amount')->getNativeCurrency();
         $this->currencies   = [];
         $this->balances     = [];
         $this->objectGroups = [];

app/Support/Report/Budget/BudgetReportGenerator.php

@@ -347,6 +347,6 @@ class BudgetReportGenerator
         $this->blRepository->setUser($user);
         $this->opsRepository->setUser($user);
         $this->nbRepository->setUser($user);
-        $this->currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+        $this->currency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);
     }
 }

app/Support/Report/Summarizer/TransactionSummarizer.php

@@ -45,7 +45,7 @@ class TransactionSummarizer
     public function setUser(User $user): void
     {
         $this->user            = $user;
-        $this->default         = Amount::getDefaultCurrencyByUserGroup($user->userGroup);
+        $this->default         = Amount::getNativeCurrencyByUserGroup($user->userGroup);
         $this->convertToNative = Amount::convertToNative($user);
     }
 
@@ -117,7 +117,7 @@ class TransactionSummarizer
         $idKey           = sprintf('%s_account_id', $direction);
         $nameKey         = sprintf('%s_account_name', $direction);
         $convertToNative = Amount::convertToNative($this->user);
-        $default         = Amount::getDefaultCurrencyByUserGroup($this->user->userGroup);
+        $default         = Amount::getNativeCurrencyByUserGroup($this->user->userGroup);
 
 
 

app/Support/Search/QueryParser/QueryParser.php

@@ -155,7 +155,7 @@ class QueryParser implements QueryParserInterface
                         $fieldName              = $tokenUnderConstruction;
                         $tokenUnderConstruction = '';
                     }
-                    if ('' === $tokenUnderConstruction) {
+                    if ('' === $tokenUnderConstruction) { // @phpstan-ignore-line
                         // In any other location, it's just a normal character
                         $tokenUnderConstruction .= $char;
                     }

app/Support/Steam.php

@@ -75,7 +75,7 @@ class Steam
         $balances             = [];
         $formatted            = $start->format('Y-m-d');
         $startBalance         = $this->finalAccountBalance($account, $start);
-        $defaultCurrency      = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+        $defaultCurrency      = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         $accountCurrency      = $this->getAccountCurrency($account);
         $hasCurrency          = null !== $accountCurrency;
         $currency             = $accountCurrency ?? $defaultCurrency;
@@ -305,7 +305,7 @@ class Steam
 
         Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
 
-        $native          = Amount::getDefaultCurrencyByUserGroup($account->user->userGroup);
+        $native          = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
         $convertToNative = Amount::convertToNative($account->user);
         $accountCurrency = $this->getAccountCurrency($account);
         $hasCurrency     = null !== $accountCurrency;
@@ -407,7 +407,7 @@ class Steam
 
             return [];
         }
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $defaultCurrency = app('amount')->getNativeCurrency();
         if ($convertToNative) {
             if ($defaultCurrency->id === $currency?->id) {
                 Log::debug(sprintf('Unset "native_balance" and "%s" for account #%d', $defaultCurrency->code, $account->id));

app/Support/Twig/AmountFormat.php

@@ -48,7 +48,7 @@ class AmountFormat extends AbstractExtension
         return new TwigFilter(
             'formatAmount',
             static function (string $string): string {
-                $currency = app('amount')->getDefaultCurrency();
+                $currency = app('amount')->getNativeCurrency();
 
                 return app('amount')->formatAnything($currency, $string, true);
             },
@@ -61,7 +61,7 @@ class AmountFormat extends AbstractExtension
         return new TwigFilter(
             'formatAmountPlain',
             static function (string $string): string {
-                $currency = app('amount')->getDefaultCurrency();
+                $currency = app('amount')->getNativeCurrency();
 
                 return app('amount')->formatAnything($currency, $string, false);
             },
@@ -93,7 +93,7 @@ class AmountFormat extends AbstractExtension
 
                 /** @var AccountRepositoryInterface $accountRepos */
                 $accountRepos = app(AccountRepositoryInterface::class);
-                $currency     = $accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
+                $currency     = $accountRepos->getAccountCurrency($account) ?? app('amount')->getNativeCurrency();
 
                 return app('amount')->formatAnything($currency, $amount, $coloured);
             },

app/Support/Twig/General.php

@@ -69,7 +69,7 @@ class General extends AbstractExtension
                 $date            = session('end', today(config('app.timezone'))->endOfMonth());
                 $info            = Steam::finalAccountBalance($account, $date);
                 $currency        = Steam::getAccountCurrency($account);
-                $default         = Amount::getDefaultCurrency();
+                $default         = Amount::getNativeCurrency();
                 $convertToNative = Amount::convertToNative();
                 $useNative       = $convertToNative && $default->id !== $currency->id;
                 $strings         = [];

app/Transformers/AccountTransformer.php

@@ -50,7 +50,7 @@ class AccountTransformer extends AbstractTransformer
         $this->parameters      = new ParameterBag();
         $this->repository      = app(AccountRepositoryInterface::class);
         $this->convertToNative = Amount::convertToNative();
-        $this->default         = Amount::getDefaultCurrency();
+        $this->default         = Amount::getNativeCurrency();
     }
 
     /**
@@ -72,12 +72,12 @@ class AccountTransformer extends AbstractTransformer
         $convertToNative                                              = Amount::convertToNative();
 
         // get account role (will only work if the type is asset).
-        $default                                                      = Amount::getDefaultCurrency();
+        $default                                                      = Amount::getNativeCurrency();
         $accountRole                                                  = $this->getAccountRole($account, $accountType);
         $date                                                         = $this->getDate();
         $date->endOfDay();
 
-        [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account, $default);
+        [$currencyId, $currencyCode, $currencySymbol, $decimalPlaces] = $this->getCurrency($account);
         [$creditCardType, $monthlyPaymentDate]                        = $this->getCCInfo($account, $accountRole, $accountType);
         [$openingBalance, $nativeOpeningBalance, $openingBalanceDate] = $this->getOpeningBalance($account, $accountType, $convertToNative);
         [$interest, $interestPeriod]                                  = $this->getInterest($account, $accountType);

app/Transformers/AvailableBudgetTransformer.php

@@ -50,7 +50,7 @@ class AvailableBudgetTransformer extends AbstractTransformer
         $this->repository         = app(BudgetRepositoryInterface::class);
         $this->opsRepository      = app(OperationsRepositoryInterface::class);
         $this->noBudgetRepository = app(NoBudgetRepositoryInterface::class);
-        $this->default            = Amount::getDefaultCurrency();
+        $this->default            = Amount::getNativeCurrency();
         $this->convertToNative    = Amount::convertToNative();
     }
 

app/Transformers/BillTransformer.php

@@ -52,7 +52,7 @@ class BillTransformer extends AbstractTransformer
     {
         $this->repository      = app(BillRepositoryInterface::class);
         $this->calculator      = app(BillDateCalculator::class);
-        $this->default         = Amount::getDefaultCurrency();
+        $this->default         = Amount::getNativeCurrency();
         $this->convertToNative = Amount::convertToNative();
     }
 

app/Transformers/BudgetLimitTransformer.php

@@ -47,7 +47,7 @@ class BudgetLimitTransformer extends AbstractTransformer
 
     public function __construct()
     {
-        $this->default         = Amount::getDefaultCurrency();
+        $this->default         = Amount::getNativeCurrency();
         $this->convertToNative = Amount::convertToNative();
     }
 

app/Transformers/BudgetTransformer.php

@@ -51,7 +51,7 @@ class BudgetTransformer extends AbstractTransformer
         $this->opsRepository   = app(OperationsRepositoryInterface::class);
         $this->repository      = app(BudgetRepositoryInterface::class);
         $this->parameters      = new ParameterBag();
-        $this->default         = Amount::getDefaultCurrency();
+        $this->default         = Amount::getNativeCurrency();
         $this->convertToNative = Amount::convertToNative();
     }
 

app/Transformers/CategoryTransformer.php

@@ -48,7 +48,7 @@ class CategoryTransformer extends AbstractTransformer
     {
         $this->opsRepository   = app(OperationsRepositoryInterface::class);
         $this->repository      = app(CategoryRepositoryInterface::class);
-        $this->default         = Amount::getDefaultCurrency();
+        $this->default         = Amount::getNativeCurrency();
         $this->convertToNative = Amount::convertToNative();
     }
 

app/Transformers/CurrencyTransformer.php

@@ -41,6 +41,7 @@ class CurrencyTransformer extends AbstractTransformer
             'created_at'     => $currency->created_at->toAtomString(),
             'updated_at'     => $currency->updated_at->toAtomString(),
             'native'         => $currency->userGroupNative,
+            'default'        => $currency->userGroupNative,
             'enabled'        => $currency->userGroupEnabled,
             'name'           => $currency->name,
             'code'           => $currency->code,

app/Transformers/PiggyBankEventTransformer.php

@@ -61,7 +61,7 @@ class PiggyBankEventTransformer extends AbstractTransformer
         $this->piggyRepos->setUser($account->user);
 
         // get associated currency or fall back to the default:
-        $currency  = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
+        $currency  = $this->repository->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
 
         // get associated journal and transaction, if any:
         $journalId = $event->transaction_journal_id;

app/Transformers/UserGroupTransformer.php

@@ -106,7 +106,7 @@ class UserGroupTransformer extends AbstractTransformer
      */
     public function transform(UserGroup $userGroup): array
     {
-        $currency = Amount::getDefaultCurrencyByUserGroup($userGroup);
+        $currency = Amount::getNativeCurrencyByUserGroup($userGroup);
 
         return [
             'id'                             => $userGroup->id,

app/Transformers/V2/AccountTransformer.php

@@ -135,7 +135,7 @@ class AccountTransformer extends AbstractTransformer
 
     private function getDefaultCurrency(): void
     {
-        $this->default = app('amount')->getDefaultCurrency();
+        $this->default = app('amount')->getNativeCurrency();
     }
 
     private function collectAccountMetaData(Collection $accounts): void

app/Transformers/V2/BillTransformer.php

@@ -97,7 +97,7 @@ class BillTransformer extends AbstractTransformer
             ];
         }
         Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
-        $this->default    = app('amount')->getDefaultCurrency();
+        $this->default    = app('amount')->getNativeCurrency();
         $this->converter  = new ExchangeRateConverter();
 
         // grab all paid dates:

app/Transformers/V2/CurrencyTransformer.php

@@ -47,6 +47,7 @@ class CurrencyTransformer extends AbstractTransformer
             'created_at'     => $currency->created_at->toAtomString(),
             'updated_at'     => $currency->updated_at->toAtomString(),
             'native'         => $currency->userGroupNative,
+            'default'        => $currency->userGroupNative,
             'enabled'        => $currency->userGroupEnabled,
             'name'           => $currency->name,
             'code'           => $currency->code,

app/Transformers/V2/PiggyBankTransformer.php

@@ -137,7 +137,7 @@ class PiggyBankTransformer extends AbstractTransformer
         }
 
         Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
-        $this->default       = app('amount')->getDefaultCurrencyByUserGroup(auth()->user()->userGroup);
+        $this->default       = app('amount')->getNativeCurrencyByUserGroup(auth()->user()->userGroup);
         $this->converter     = new ExchangeRateConverter();
 
         return $objects;
@@ -156,7 +156,7 @@ class PiggyBankTransformer extends AbstractTransformer
         //        $this->piggyRepos->setUser($account->user);
 
         // get currency from account, or use default.
-        //        $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUser($account->user);
+        //        $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUser($account->user);
 
         // note
         //        $notes = $this->piggyRepos->getNoteText($piggyBank);

app/Transformers/V2/TransactionGroupTransformer.php

@@ -79,7 +79,7 @@ class TransactionGroupTransformer extends AbstractTransformer
             }
         }
 
-        $this->default     = app('amount')->getDefaultCurrency();
+        $this->default     = app('amount')->getNativeCurrency();
         $this->converter   = new ExchangeRateConverter();
 
         $this->collectAllMetaData();

app/Validation/TransactionValidation.php

@@ -223,7 +223,7 @@ trait TransactionValidation
 
         /** @var AccountRepository $accountRepository */
         $accountRepository   = app(AccountRepositoryInterface::class);
-        $defaultCurrency     = app('amount')->getDefaultCurrency();
+        $defaultCurrency     = app('amount')->getNativeCurrency();
         $sourceCurrency      = $accountRepository->getAccountCurrency($source) ?? $defaultCurrency;
         $destinationCurrency = $accountRepository->getAccountCurrency($destination) ?? $defaultCurrency;
         // if both accounts have the same currency, continue.

changelog.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 6.2.0 - 2025-01-xx
+## 6.2.0 - 2025-01-19 (or later)
 
 ### Added
 
@@ -11,14 +11,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Notifications support Nfty, Pushover, Slack and Discord.
 - Many new security related notifications.
 - [Issue 5523](https://github.com/firefly-iii/firefly-iii/issues/5523) (Add comment on a budget for a given month) reported by @n-serrette
-- [Issue 8531](https://github.com/firefly-iii/firefly-iii/issues/8531) (Add `notes` to transaction audit report) reported by @clouserw
-- [Issue 8307](https://github.com/firefly-iii/firefly-iii/issues/8307) (Notification support for Ntfy (and other push notification tools)) reported by @ragnarkarlsson
-- [Issue 7945](https://github.com/firefly-iii/firefly-iii/issues/7945) ("Rules" that only trigger manually) reported by @SekoiaTree
-- [Issue 6760](https://github.com/firefly-iii/firefly-iii/issues/6760) (Add a new trigger for automated rules) reported by @Gsyltc
-- [Issue 6557](https://github.com/firefly-iii/firefly-iii/issues/6557) (Piggy Banks - Draw Funds from Multiple Accounts) reported by @BugPhobic
 - [Issue 5532](https://github.com/firefly-iii/firefly-iii/issues/5532) (Asset prices and exchange rates) reported by @svozniuk
 - [Issue 6314](https://github.com/firefly-iii/firefly-iii/issues/6314) (Currencies and exchange rates) reported by @JC5
+- [Issue 6557](https://github.com/firefly-iii/firefly-iii/issues/6557) (Piggy Banks - Draw Funds from Multiple Accounts) reported by @BugPhobic
+- [Issue 6760](https://github.com/firefly-iii/firefly-iii/issues/6760) (Add a new trigger for automated rules) reported by @Gsyltc
+- [Issue 7945](https://github.com/firefly-iii/firefly-iii/issues/7945) ("Rules" that only trigger manually) reported by @SekoiaTree
+- [Issue 8307](https://github.com/firefly-iii/firefly-iii/issues/8307) (Notification support for Ntfy (and other push notification tools)) reported by @ragnarkarlsson
+- [Issue 8531](https://github.com/firefly-iii/firefly-iii/issues/8531) (Add `notes` to transaction audit report) reported by @clouserw
+- [Discussion 9576](https://github.com/orgs/firefly-iii/discussions/9576) (How to Mark Reconciled Transactions as Unreconciled) started by @softpoint-arch
+- [Issue 9667](https://github.com/firefly-iii/firefly-iii/issues/9667) (Exported data only exports negative amounts?) reported by @electricmessiah
 - [Issue 9586](https://github.com/firefly-iii/firefly-iii/issues/9586) (Non en_US translated string in sign-up mail) reported by @benni347
+- [PR 9598](https://github.com/firefly-iii/firefly-iii/pull/9598) (New Query Parser for Search Engine and Rules) reported by @Sobuno
 
 ### Changed
 
@@ -26,6 +29,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 9501](https://github.com/firefly-iii/firefly-iii/issues/9501) (PHP8.4 support) reported by @JC5
 - Docker container no longer runs under root.
 - "Bills" are now called "subscriptions" to better reflect their purpose.
+- Rename "administration" to "settings" to prevent confusion with "financial administrations"
+- Rename 'default currency' to 'native currency'
+- Move native currency setting to financial administration edit screen to better reflect where it belongs
 
 ### Removed
 

composer.lock

@@ -11207,16 +11207,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.10.2",
+            "version": "5.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8"
+                "reference": "5346664973d10cf1abff20837fb1183f3c11a055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/72afbce7e4b421593b60d2eb7281e37a50734df8",
-                "reference": "72afbce7e4b421593b60d2eb7281e37a50734df8",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/5346664973d10cf1abff20837fb1183f3c11a055",
+                "reference": "5346664973d10cf1abff20837fb1183f3c11a055",
                 "shasum": ""
             },
             "require": {
@@ -11290,7 +11290,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-12-05T15:04:09+00:00"
+            "time": "2025-01-19T04:14:02+00:00"
         },
         {
             "name": "phpstan/extension-installer",
@@ -11447,16 +11447,16 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "ed6fea0ad4ad9c7e25f3ad2e7c4d420cf1e67fe3"
+                "reference": "02277ce4b0dd03d74f15282064f8f027d1dec9cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/ed6fea0ad4ad9c7e25f3ad2e7c4d420cf1e67fe3",
-                "reference": "ed6fea0ad4ad9c7e25f3ad2e7c4d420cf1e67fe3",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/02277ce4b0dd03d74f15282064f8f027d1dec9cc",
+                "reference": "02277ce4b0dd03d74f15282064f8f027d1dec9cc",
                 "shasum": ""
             },
             "require": {
@@ -11489,9 +11489,9 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.1"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.2"
             },
-            "time": "2024-12-12T20:21:10+00:00"
+            "time": "2025-01-19T13:03:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

config/firefly.php

@@ -81,7 +81,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-01-19',
+    'version'                      => 'develop/2025-01-20',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -2591,9 +2591,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz",
-            "integrity": "sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
+            "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
             "cpu": [
                 "arm"
             ],
@@ -2605,9 +2605,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.1.tgz",
-            "integrity": "sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
+            "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
             "cpu": [
                 "arm64"
             ],
@@ -2619,9 +2619,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.1.tgz",
-            "integrity": "sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
+            "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
             "cpu": [
                 "arm64"
             ],
@@ -2633,9 +2633,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.1.tgz",
-            "integrity": "sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
+            "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
             "cpu": [
                 "x64"
             ],
@@ -2647,9 +2647,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.1.tgz",
-            "integrity": "sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
+            "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
             "cpu": [
                 "arm64"
             ],
@@ -2661,9 +2661,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.1.tgz",
-            "integrity": "sha512-1MEdGqogQLccphhX5myCJqeGNYTNcmTyaic9S7CG3JhwuIByJ7J05vGbZxsizQthP1xpVx7kd3o31eOogfEirw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
+            "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
             "cpu": [
                 "x64"
             ],
@@ -2675,9 +2675,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.1.tgz",
-            "integrity": "sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
+            "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
             "cpu": [
                 "arm"
             ],
@@ -2689,9 +2689,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.1.tgz",
-            "integrity": "sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
+            "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
             "cpu": [
                 "arm"
             ],
@@ -2703,9 +2703,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.1.tgz",
-            "integrity": "sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
+            "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
             "cpu": [
                 "arm64"
             ],
@@ -2717,9 +2717,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.1.tgz",
-            "integrity": "sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
+            "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
             "cpu": [
                 "arm64"
             ],
@@ -2731,9 +2731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.1.tgz",
-            "integrity": "sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
+            "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
             "cpu": [
                 "loong64"
             ],
@@ -2745,9 +2745,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.1.tgz",
-            "integrity": "sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
+            "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2759,9 +2759,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.1.tgz",
-            "integrity": "sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
+            "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2773,9 +2773,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.1.tgz",
-            "integrity": "sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
+            "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2787,9 +2787,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.1.tgz",
-            "integrity": "sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
+            "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
             "cpu": [
                 "x64"
             ],
@@ -2801,9 +2801,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.1.tgz",
-            "integrity": "sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
+            "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
             "cpu": [
                 "x64"
             ],
@@ -2815,9 +2815,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.1.tgz",
-            "integrity": "sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
+            "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
             "cpu": [
                 "arm64"
             ],
@@ -2829,9 +2829,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.1.tgz",
-            "integrity": "sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
+            "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2843,9 +2843,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.1.tgz",
-            "integrity": "sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
+            "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
             "cpu": [
                 "x64"
             ],
@@ -9987,9 +9987,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.30.1.tgz",
-            "integrity": "sha512-mlJ4glW020fPuLi7DkM/lN97mYEZGWeqBnrljzN0gs7GLctqX3lNWxKQ7Gl712UAX+6fog/L3jh4gb7R6aVi3w==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
+            "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10003,25 +10003,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.30.1",
-                "@rollup/rollup-android-arm64": "4.30.1",
-                "@rollup/rollup-darwin-arm64": "4.30.1",
-                "@rollup/rollup-darwin-x64": "4.30.1",
-                "@rollup/rollup-freebsd-arm64": "4.30.1",
-                "@rollup/rollup-freebsd-x64": "4.30.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.30.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.30.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.30.1",
-                "@rollup/rollup-linux-arm64-musl": "4.30.1",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.30.1",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.30.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.30.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-musl": "4.30.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.30.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.30.1",
-                "@rollup/rollup-win32-x64-msvc": "4.30.1",
+                "@rollup/rollup-android-arm-eabi": "4.31.0",
+                "@rollup/rollup-android-arm64": "4.31.0",
+                "@rollup/rollup-darwin-arm64": "4.31.0",
+                "@rollup/rollup-darwin-x64": "4.31.0",
+                "@rollup/rollup-freebsd-arm64": "4.31.0",
+                "@rollup/rollup-freebsd-x64": "4.31.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.31.0",
+                "@rollup/rollup-linux-arm64-musl": "4.31.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.31.0",
+                "@rollup/rollup-linux-x64-gnu": "4.31.0",
+                "@rollup/rollup-linux-x64-musl": "4.31.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.31.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.31.0",
+                "@rollup/rollup-win32-x64-msvc": "4.31.0",
                 "fsevents": "~2.3.2"
             }
         },

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

@@ -1,10 +1,10 @@
 {
     "firefly": {
         "administrations_page_title": "Finanzverwaltungen",
-        "administrations_index_menu": "Financial administrations",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_index_menu": "Finanzverwaltung",
+        "temp_administrations_introduction": "Firefly III wird bald die M\u00f6glichkeit erhalten, mehrere Finanzverwaltungen zu verwalten. Im Moment verf\u00fcgen Sie nur \u00fcber eine. Sie k\u00f6nnen den Titel dieser Verwaltung und ihre eigene W\u00e4hrung festlegen. Dies ersetzt die bisherige Einstellung, bei der Sie Ihre \u201eStandardw\u00e4hrung\u201c festlegen konnten. Diese Einstellung ist jetzt an die Finanzverwaltung gebunden und kann f\u00fcr jede Verwaltung unterschiedlich sein.",
+        "administration_currency_form_help": "Es kann l\u00e4nger dauern, bis die Seite geladen ist, wenn Sie die Landesw\u00e4hrung \u00e4ndern, da die Buchungen m\u00f6glicherweise in Ihre (neue) Landesw\u00e4hrung umgerechnet werden m\u00fcssen.",
+        "administrations_page_edit_sub_title_js": "Finanzverwaltung \u201e{title}\u201c bearbeiten",
         "table": "Tabelle",
         "welcome_back": "\u00dcberblick",
         "flash_error": "Fehler!",
@@ -151,7 +151,7 @@
         "url": "URL",
         "active": "Aktiv",
         "interest_date": "Zinstermin",
-        "administration_currency": "Native currency",
+        "administration_currency": "Landesw\u00e4hrung",
         "title": "Titel",
         "date": "Datum",
         "book_date": "Buchungsdatum",
@@ -171,7 +171,7 @@
     "list": {
         "title": "Titel",
         "active": "Aktiv?",
-        "native_currency": "Native currency",
+        "native_currency": "Landesw\u00e4hrung",
         "trigger": "Ausl\u00f6ser",
         "response": "Antwort",
         "delivery": "Zustellung",

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

@@ -1,10 +1,10 @@
 {
     "firefly": {
         "administrations_page_title": "Administrations financi\u00e8res",
-        "administrations_index_menu": "Financial administrations",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_index_menu": "Administrations financi\u00e8res",
+        "temp_administrations_introduction": "Firefly III aura bient\u00f4t la possibilit\u00e9 de g\u00e9rer plusieurs administrations financi\u00e8res. Pour le moment, vous n'en avez qu'une. Vous pouvez d\u00e9finir le titre de cette administration et de sa devise locale. Cela remplace le param\u00e8tre pr\u00e9c\u00e9dent o\u00f9 vous d\u00e9finissiez votre \"devise par d\u00e9faut\". Ce param\u00e8tre est d\u00e9sormais li\u00e9 \u00e0 l'administration financi\u00e8re et peut \u00eatre diff\u00e9rent par administration.",
+        "administration_currency_form_help": "La page peut mettre longtemps \u00e0 charger si vous modifiez la devise locale, car des op\u00e9rations peuvent n\u00e9cessiter une conversion vers votre (nouvelle) devise locale.",
+        "administrations_page_edit_sub_title_js": "Modifier l'administration financi\u00e8re \"{title}\"",
         "table": "Tableau",
         "welcome_back": "Quoi de neuf ?",
         "flash_error": "Erreur !",
@@ -151,7 +151,7 @@
         "url": "Liens",
         "active": "Actif",
         "interest_date": "Date de valeur (int\u00e9r\u00eats)",
-        "administration_currency": "Native currency",
+        "administration_currency": "Devise locale",
         "title": "Titre",
         "date": "Date",
         "book_date": "Date d'enregistrement",
@@ -171,7 +171,7 @@
     "list": {
         "title": "Titre",
         "active": "Actif ?",
-        "native_currency": "Native currency",
+        "native_currency": "Devise locale",
         "trigger": "D\u00e9clencheur",
         "response": "R\u00e9ponse",
         "delivery": "Distribution",

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

@@ -1,10 +1,10 @@
 {
     "firefly": {
         "administrations_page_title": "Grootboeken",
-        "administrations_index_menu": "Financial administrations",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_index_menu": "Grootboeken",
+        "temp_administrations_introduction": "Firefly III krijgt binnenkort het vermogen om meerdere grootboeken te beheren. Op dit moment kan dat nog niet. Je kan de titel van dit grootboek instellen en de basisvaluta. Dit vervangt de voorgaande manier waarop je je \"standaardvaluta\" zou instellen. Deze instelling is nu gekoppeld aan dit grootboek, en kan per grootboek verschillend zijn.",
+        "administration_currency_form_help": "Het wijzigen van deze instelling betekent dat heel veel transacties omgerekend moeten worden naar je nieuwe basisvaluta en dat kan lang duren.",
+        "administrations_page_edit_sub_title_js": "Wijzig grootboek \"{title}\"",
         "table": "Tabel",
         "welcome_back": "Hoe staat het er voor?",
         "flash_error": "Fout!",
@@ -151,7 +151,7 @@
         "url": "URL",
         "active": "Actief",
         "interest_date": "Rentedatum",
-        "administration_currency": "Native currency",
+        "administration_currency": "Basisvaluta",
         "title": "Titel",
         "date": "Datum",
         "book_date": "Boekdatum",
@@ -171,7 +171,7 @@
     "list": {
         "title": "Titel",
         "active": "Actief?",
-        "native_currency": "Native currency",
+        "native_currency": "Basisvaluta",
         "trigger": "Trigger",
         "response": "Reactie",
         "delivery": "Bericht",