Fix https://github.com/firefly-iii/firefly-iii/issues/12354

Bump shell-quote from 1.8.3 to 1.8.4 in the npm_and_yarn group across 1 directory

.ci/php-cs-fixer/composer.lock

@@ -471,16 +471,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.95.3",
+            "version": "v3.95.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "3d681493acc0e93283481b1c63c263737df78687"
+                "reference": "3f8f68856837a77e1f1d870354eca3c8747f2f72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3d681493acc0e93283481b1c63c263737df78687",
-                "reference": "3d681493acc0e93283481b1c63c263737df78687",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f8f68856837a77e1f1d870354eca3c8747f2f72",
+                "reference": "3f8f68856837a77e1f1d870354eca3c8747f2f72",
                 "shasum": ""
             },
             "require": {
@@ -564,7 +564,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.4"
             },
             "funding": [
                 {
@@ -572,7 +572,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-05-29T20:35:26+00:00"
+            "time": "2026-06-03T18:02:44+00:00"
         },
         {
             "name": "psr/container",

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

@@ -87,8 +87,7 @@ final class BalanceController extends Controller
 
         // get journals for entire period:
 
-        $this->collector
-            ->setRange($queryParameters['start'], $queryParameters['end'])
+        $this->collector->setRange($queryParameters['start'], $queryParameters['end'])
             ->withAccountInformation()
             ->setXorAccounts($accounts)
             ->setTypes([

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

@@ -158,10 +158,7 @@ final class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd(
-                        (string) $response[$foreignKey]['difference'],
-                        Steam::positive($journal['foreign_amount'])
-                    );
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }
             }

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

@@ -155,10 +155,7 @@ final class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd(
-                        (string) $response[$foreignKey]['difference'],
-                        Steam::positive($journal['foreign_amount'])
-                    );
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }
             }

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

@@ -31,7 +31,7 @@ use FireflyIII\Enums\WebhookResponse;
 use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Binder\EitherConfigKey;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
@@ -128,7 +128,7 @@ final class ConfigurationController extends Controller
         $data      = $request->getAll();
         $shortName = str_replace('configuration.', '', $name);
 
-        FireflyConfig::set($shortName, $data['value']);
+        AppConfiguration::set($shortName, $data['value']);
 
         // get updated config:
         $newConfig = $this->getDynamicConfiguration();
@@ -148,17 +148,17 @@ final class ConfigurationController extends Controller
      */
     private function getDynamicConfiguration(): array
     {
-        $isDemoSite            = FireflyConfig::get('is_demo_site', false);
-        $updateCheck           = FireflyConfig::get('permission_update_check', -1);
-        $singleUser            = FireflyConfig::get('single_user_mode', true);
-        $lastCheck             = FireflyConfig::get('last_update_check', 1);
-        $enableExchangeRates   = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'));
-        $useRunningBalance     = FireflyConfig::get('use_running_balance', true);
-        $enableExternalMap     = FireflyConfig::get('enable_external_map', false);
-        $enableExternalRates   = FireflyConfig::get('enable_external_rates', false);
-        $allowWebhooks         = FireflyConfig::get('allow_webhooks', false);
-        $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false);
-        $validUrlProtocols     = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'));
+        $isDemoSite            = AppConfiguration::get('is_demo_site', false);
+        $updateCheck           = AppConfiguration::get('permission_update_check', -1);
+        $singleUser            = AppConfiguration::get('single_user_mode', true);
+        $lastCheck             = AppConfiguration::get('last_update_check', 1);
+        $enableExchangeRates   = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'));
+        $useRunningBalance     = AppConfiguration::get('use_running_balance', true);
+        $enableExternalMap     = AppConfiguration::get('enable_external_map', false);
+        $enableExternalRates   = AppConfiguration::get('enable_external_rates', false);
+        $allowWebhooks         = AppConfiguration::get('allow_webhooks', false);
+        $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false);
+        $validUrlProtocols     = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'));
 
         return [
             'is_demo_site'            => $isDemoSite?->data,

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

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\System;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\CronRequest;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Http\Controllers\CronRunner;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
@@ -51,7 +51,7 @@ final class CronController extends Controller
         $return                           = [];
         $return['recurring_transactions'] = $this->runRecurring($config['force'], $config['date']);
         $return['auto_budgets']           = $this->runAutoBudget($config['force'], $config['date']);
-        if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data) {
+        if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data) {
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
         $return['bill_notifications']     = $this->billWarningCronJob($config['force'], $config['date']);

app/Api/V1/Controllers/Webhook/AttemptController.php

@@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookAttempt;
 use FireflyIII\Models\WebhookMessage;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Transformers\WebhookAttemptTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -71,7 +71,7 @@ final class AttemptController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf(
                 'User lists webhook attempts of webhook #%d and message #%d, but webhooks are DISABLED.',
                 $webhook->id,
@@ -119,7 +119,7 @@ final class AttemptController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf(
                 'User views single webhook attempt #%d of webhook #%d and message #%d, but webhooks are DISABLED',
                 $attempt->id,

app/Api/V1/Controllers/Webhook/DestroyController.php

@@ -30,7 +30,7 @@ use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookAttempt;
 use FireflyIII\Models\WebhookMessage;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
@@ -62,7 +62,7 @@ final class DestroyController extends Controller
      */
     public function destroy(Webhook $webhook): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d. but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -92,7 +92,7 @@ final class DestroyController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf(
                 'User tries to destroy webhook #%d, message #%d, attempt #%d, but webhooks are DISABLED.',
                 $webhook->id,
@@ -125,7 +125,7 @@ final class DestroyController extends Controller
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
 
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to destroy webhook #%d, message #%d, but webhooks are DISABLED.', $webhook->id, $message->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Controllers/Webhook/MessageController.php

@@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookMessage;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Transformers\WebhookMessageTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -65,7 +65,7 @@ final class MessageController extends Controller
      */
     public function index(Webhook $webhook): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to view messages of webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -105,7 +105,7 @@ final class MessageController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User tries to view message #%d of webhook #%d, but webhooks are DISABLED.', $message->id, $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -31,7 +31,7 @@ use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
 use FireflyIII\User;
@@ -72,7 +72,7 @@ final class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info('User tries to view all webhooks, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -114,7 +114,7 @@ final class ShowController extends Controller
      */
     public function show(Webhook $webhook): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to view webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');
@@ -146,7 +146,7 @@ final class ShowController extends Controller
      */
     public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf(
                 'User tries to trigger webhook #%d on transaction group #%d, but webhooks are DISABLED.',
                 $webhook->id,

app/Api/V1/Controllers/Webhook/StoreController.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Webhook;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
 use FireflyIII\User;
@@ -63,7 +63,7 @@ final class StoreController extends Controller
     public function store(CreateRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info('User tries to store new webhook, but webhooks are DISABLED.', $data);
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Controllers/Webhook/SubmitController.php

@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Jobs\SendWebhookMessage;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -57,7 +57,7 @@ final class SubmitController extends Controller
      */
     public function submit(Webhook $webhook): JsonResponse
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to submit webhook #%d, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Controllers/Webhook/UpdateController.php

@@ -28,7 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Webhook\UpdateRequest;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\JsonApi\Enrichments\WebhookEnrichment;
 use FireflyIII\Transformers\WebhookTransformer;
 use FireflyIII\User;
@@ -62,7 +62,7 @@ final class UpdateController extends Controller
     public function update(Webhook $webhook, UpdateRequest $request): JsonResponse
     {
         $data        = $request->getData();
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->info(sprintf('User tries to update webhook #%d, but webhooks are DISABLED.', $webhook->id), $data);
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -30,7 +30,7 @@ use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Rules\IsValidZeroOrMoreAmount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Support\Request\AppendsLocationData;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -81,7 +81,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         Log::debug('Collect rules of TransactionStoreRequest');
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         $locationRules  = Location::requestRules([]);
 
         return [

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -31,7 +31,7 @@ use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
 use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Rules\IsValidZeroOrMoreAmount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\GroupValidation;
@@ -141,7 +141,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return [
             // basic fields for group:

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\ValidatesWebhooks;
@@ -72,7 +72,7 @@ class CreateRequest extends FormRequest
         $triggers       = implode(',', array_values(Webhook::getTriggers()));
         $responses      = implode(',', array_values(Webhook::getResponses()));
         $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return [
             'title'        => ['required', 'min:1', 'max:255', 'uniqueObjectForUser:webhooks,title'],

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\Webhook\IsValidWebhookUrl;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\ValidatesWebhooks;
@@ -73,7 +73,7 @@ class UpdateRequest extends FormRequest
         $triggers       = implode(',', array_values(Webhook::getTriggers()));
         $responses      = implode(',', array_values(Webhook::getResponses()));
         $deliveries     = implode(',', array_values(Webhook::getDeliveries()));
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         /** @var Webhook $webhook */
         $webhook        = $this->route()->parameter('webhook');

app/Console/Commands/Correction/ConvertsDatesToUTC.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
@@ -58,7 +58,7 @@ class ConvertsDatesToUTC extends Command
             $this->ConvertModeltoUTC($model, $fields);
         }
         // tell the system we are now in UTC mode.
-        FireflyConfig::set('utc', true);
+        AppConfiguration::set('utc', true);
 
         return Command::SUCCESS;
     }

app/Console/Commands/Correction/CorrectsPrimaryCurrencyAmounts.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Services\Internal\Recalculate\PrimaryAmountRecalculationService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -43,7 +43,7 @@ class CorrectsPrimaryCurrencyAmounts extends Command
      */
     public function handle(): int
     {
-        if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) {
+        if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) {
             $this->friendlyInfo('This command will not run because currency exchange rates are disabled.');
 
             return 0;

app/Console/Commands/Correction/CorrectsTimezoneInformation.php

@@ -36,7 +36,7 @@ use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
@@ -71,7 +71,7 @@ class CorrectsTimezoneInformation extends Command
             $this->addTimezoneToModel($model, $fields);
         }
         // not yet in UTC mode
-        FireflyConfig::set('utc', false);
+        AppConfiguration::set('utc', false);
     }
 
     private function addTimezoneToModel(string $model, array $fields): void

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -30,7 +30,7 @@ use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
@@ -61,7 +61,7 @@ class CorrectsUnevenAmount extends Command
 
         $this->fixUnevenAmounts();
         $this->matchCurrencies();
-        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
+        if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.');
             AccountBalanceCalculator::recalculateAll(false);
             $this->friendlyInfo('Done recalculating transaction running balance columns.');

app/Console/Commands/SendTestEmail.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands;
 
 use FireflyIII\Events\Test\OwnerTestsNotificationChannel;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class SendTestEmail extends Command
@@ -63,7 +63,7 @@ class SendTestEmail extends Command
         }
 
         /** @var int $lastNotification */
-        $lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
+        $lastNotification = AppConfiguration::get('last_test_notification', 123)->data;
         if ((time() - $lastNotification) < 120) {
             $this->friendlyError((string) trans('firefly.test_rate_limited'));
 
@@ -72,7 +72,7 @@ class SendTestEmail extends Command
 
         $owner            = new OwnerNotifiable();
         event(new OwnerTestsNotificationChannel('email', $owner));
-        FireflyConfig::set('last_test_notification', time());
+        AppConfiguration::set('last_test_notification', time());
 
         return Command::SUCCESS;
     }

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 
@@ -52,7 +52,7 @@ class RecalculatesRunningBalance extends Command
      */
     public function handle(): int
     {
-        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
+        if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
             $this->correctBalanceAmounts($this->option('force'));
             $this->friendlyInfo('Done recalculating account balances.');

app/Console/Commands/System/SetsLatestVersion.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class SetsLatestVersion extends Command
@@ -46,7 +46,7 @@ class SetsLatestVersion extends Command
 
             return 0;
         }
-        FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
+        AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
         $this->friendlyInfo('Updated version.');
 
         return 0;

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\System;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
@@ -108,8 +108,8 @@ class VerifySecurityAlerts extends Command
     private function removeOldAdvisory(): void
     {
         try {
-            FireflyConfig::delete('upgrade_security_message');
-            FireflyConfig::delete('upgrade_security_level');
+            AppConfiguration::delete('upgrade_security_message');
+            AppConfiguration::delete('upgrade_security_level');
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not delete old security advisory, but thats OK: %s', $e->getMessage()));
         }
@@ -118,8 +118,8 @@ class VerifySecurityAlerts extends Command
     private function saveSecurityAdvisory(array $array): void
     {
         try {
-            FireflyConfig::set('upgrade_security_message', $array['message']);
-            FireflyConfig::set('upgrade_security_level', $array['level']);
+            AppConfiguration::set('upgrade_security_message', $array['message']);
+            AppConfiguration::set('upgrade_security_level', $array['level']);
         } catch (QueryException $e) {
             Log::debug(sprintf('Could not save new security advisory, but thats OK: %s', $e->getMessage()));
         }

app/Console/Commands/Tools/ChecksForUpdates.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Tools;
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class ChecksForUpdates extends Command
@@ -57,7 +57,7 @@ class ChecksForUpdates extends Command
         $version    = config('firefly.version');
 
         $this->friendlyLine(sprintf('You are running version "%s", built on %s', $version, $build->format('Y-m-d H:i')));
-        $permission = FireflyConfig::get('permission_update_check', -1)->data;
+        $permission = AppConfiguration::get('permission_update_check', -1)->data;
         if (1 !== $permission && false === $this->option('force')) {
             $this->friendlyWarning('Checking for updates is disabled. To overrule, use --force.');
 

app/Console/Commands/Tools/Cron.php

@@ -33,7 +33,7 @@ use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob;
 use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use FireflyIII\Support\Cronjobs\UpdateCheckCronjob;
 use FireflyIII\Support\Cronjobs\WebhookCronjob;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use InvalidArgumentException;
@@ -74,7 +74,7 @@ class Cron extends Command
         $force = (bool) $this->option('force');
 
         // Fire exchange rates cron job.
-        if (true === FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {
+        if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data && ($doAll || $this->option('download-cer'))) {
             try {
                 $this->exchangeRatesCronJob($force, $date);
             } catch (FireflyException $e) {

app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php

@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
@@ -115,14 +115,14 @@ class AddsTransactionIdentifiers extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     /**

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Preference;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Crypt;
@@ -145,7 +145,7 @@ class RemovesDatabaseDecryption extends Command
         $this->friendlyPositive(sprintf('Decrypted the data in table "%s".', $table));
         // mark as decrypted:
         $configName = sprintf('is_decrypted_%s', $table);
-        FireflyConfig::set($configName, true);
+        AppConfiguration::set($configName, true);
     }
 
     private function isDecrypted(string $table): bool
@@ -154,7 +154,7 @@ class RemovesDatabaseDecryption extends Command
         $configVar  = null;
 
         try {
-            $configVar = FireflyConfig::get($configName, false);
+            $configVar = AppConfiguration::get($configName, false);
         } catch (FireflyException $e) {
             Log::error($e->getMessage());
         }

app/Console/Commands/Upgrade/RepairsAccountBalances.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 
@@ -45,7 +45,7 @@ class RepairsAccountBalances extends Command
 
             return 0;
         }
-        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
+        if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
             $this->markAsExecuted();
             $this->correctBalanceAmounts();
@@ -65,13 +65,13 @@ class RepairsAccountBalances extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php

@@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
@@ -75,14 +75,14 @@ class UpgradesAccountCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     /**

app/Console/Commands/Upgrade/UpgradesAccountMetaData.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\AccountMeta;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class UpgradesAccountMetaData extends Command
@@ -83,13 +83,13 @@ class UpgradesAccountMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesAttachments.php

@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Note;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -93,13 +93,13 @@ class UpgradesAttachments extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesBillsToRules.php

@@ -33,7 +33,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Console\Command;
@@ -86,14 +86,14 @@ class UpgradesBillsToRules extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function migrateBill(RuleGroup $ruleGroup, Bill $bill, Preference $language): void

app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\BudgetLimit;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -140,14 +140,14 @@ class UpgradesBudgetLimitPeriods extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function theresNoLimit(): void

app/Console/Commands/Upgrade/UpgradesBudgetLimits.php

@@ -29,7 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
@@ -89,13 +89,13 @@ class UpgradesBudgetLimits extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php

@@ -29,7 +29,7 @@ use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
@@ -82,13 +82,13 @@ class UpgradesCreditCardLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php

@@ -30,7 +30,7 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
@@ -85,14 +85,14 @@ class UpgradesCurrencyPreferences extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function runUpgrade(): void

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use Safe\Exceptions\InfoException;
@@ -87,7 +87,7 @@ class UpgradesDatabase extends Command
             $this->call($command, $args);
         }
         // index will set FF3 version.
-        FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
+        AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
 
         return 0;
     }

app/Console/Commands/Upgrade/UpgradesJournalMetaData.php

@@ -29,7 +29,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -98,21 +98,21 @@ class UpgradesJournalMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
 
     private function isMigrated(): bool
     {
-        $configVar = FireflyConfig::get(UpgradesToGroups::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(UpgradesToGroups::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function migrateAll(): void

app/Console/Commands/Upgrade/UpgradesJournalNotes.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalMeta;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -87,13 +87,13 @@ class UpgradesJournalNotes extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesLiabilities.php

@@ -31,7 +31,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
@@ -93,14 +93,14 @@ class UpgradesLiabilities extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function upgradeForUser(User $user): void

app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php

@@ -33,7 +33,7 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
@@ -132,14 +132,14 @@ class UpgradesLiabilitiesEight extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function reverseOpeningBalance(Account $account): void

app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php

@@ -29,7 +29,7 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -65,14 +65,14 @@ class UpgradesMultiPiggyBanks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function upgradePiggyBank(PiggyBank $piggyBank): void

app/Console/Commands/Upgrade/UpgradesPrimaryCurrencyAmounts.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 
@@ -59,13 +59,13 @@ class UpgradesPrimaryCurrencyAmounts extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 }

app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php

@@ -28,7 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\RecurrenceMeta;
 use FireflyIII\Models\RecurrenceTransactionMeta;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 use function Safe\json_encode;
@@ -66,14 +66,14 @@ class UpgradesRecurrenceMetaData extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function migrateEntry(RecurrenceMeta $meta): int

app/Console/Commands/Upgrade/UpgradesRuleActions.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\RuleAction;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class UpgradesRuleActions extends Command
@@ -63,14 +63,14 @@ class UpgradesRuleActions extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function replaceEqualSign(): void

app/Console/Commands/Upgrade/UpgradesTagLocations.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Location;
 use FireflyIII\Models\Tag;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class UpgradesTagLocations extends Command
@@ -63,14 +63,14 @@ class UpgradesTagLocations extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function migrateLocationDetails(Tag $tag): void

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -35,7 +35,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -260,7 +260,7 @@ class UpgradesToGroups extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
@@ -355,7 +355,7 @@ class UpgradesToGroups extends Command
 
     private function markAsMigrated(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     /**

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -32,7 +32,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
@@ -333,7 +333,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
@@ -375,7 +375,7 @@ class UpgradesTransferCurrencies extends Command
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     /**

app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php

@@ -34,7 +34,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class UpgradesVariousCurrencyInformation extends Command
@@ -149,7 +149,7 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
@@ -166,7 +166,7 @@ class UpgradesVariousCurrencyInformation extends Command
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     /**

app/Console/Commands/Upgrade/UpgradesWebhooks.php

@@ -32,7 +32,7 @@ use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookDelivery as WebhookDeliveryModel;
 use FireflyIII\Models\WebhookResponse as WebhookResponseModel;
 use FireflyIII\Models\WebhookTrigger as WebhookTriggerModel;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Console\Command;
 
 class UpgradesWebhooks extends Command
@@ -64,14 +64,14 @@ class UpgradesWebhooks extends Command
 
     private function isExecuted(): bool
     {
-        $configVar = FireflyConfig::get(self::CONFIG_NAME, false);
+        $configVar = AppConfiguration::get(self::CONFIG_NAME, false);
 
         return (bool) $configVar?->data;
     }
 
     private function markAsExecuted(): void
     {
-        FireflyConfig::set(self::CONFIG_NAME, true);
+        AppConfiguration::set(self::CONFIG_NAME, true);
     }
 
     private function upgradeWebhook(Webhook $webhook): void

app/Events/Model/TransactionGroup/TransactionGroupEventObjects.php

@@ -53,8 +53,9 @@ class TransactionGroupEventObjects
 
         /** @var TransactionJournal $journal */
         foreach ($transactionGroup->transactionJournals as $journal) {
-            Log::debug(sprintf('Appended transaction journal #%d', $journal->id));
-            $this->transactionJournals->push($journal);
+            $journal->refresh();
+            Log::debug(sprintf('Appended transaction journal #%d (%s)', $journal->id, $journal->date->format('Y-m-d H:i:s')));
+            $this->transactionJournals->put($journal->id, $journal);
             $this->budgets    = $this->budgets->merge($journal->budgets);
             $this->categories = $this->categories->merge($journal->categories);
             $this->tags       = $this->tags->merge($journal->tags);

app/Factory/TransactionJournalFactory.php

@@ -49,7 +49,7 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
 use FireflyIII\Validation\AccountValidator;
@@ -252,7 +252,7 @@ class TransactionJournalFactory
         $carbon->setTimezone(config('app.timezone'));
 
         // 2024-11-19, overrule timezone with UTC and store it as UTC.
-        if (true === FireflyConfig::get('utc', false)->data) {
+        if (true === AppConfiguration::get('utc', false)->data) {
             $carbon->setTimezone('UTC');
         }
 

app/Generator/Webhook/StandardMessageGenerator.php

@@ -136,7 +136,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
 
         /** @var WebhookResponseModel $response */
         $response      = $webhook->webhookResponses()->first();
-        $this->getTriggerTitles($webhook->webhookTriggers()->get());
+        // $this->getTriggerTitles($webhook->webhookTriggers()->get());
         $basicMessage  = [
             'uuid'          => $uuid->toString(),
             'user_id'       => 0,
@@ -299,22 +299,21 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         return $response->title;
     }
 
-    private function getTriggerTitles(Collection $collection): array
-    {
-        $return = [];
-
-        /** @var WebhookTriggerModel $item */
-        foreach ($collection as $item) {
-            $return[] = $item->title;
-        }
-
-        return array_unique($return);
-    }
+    //    private function getTriggerTitles(Collection $collection): array
+    //    {
+    //        $return = [];
+    //
+    //        /** @var WebhookTriggerModel $item */
+    //        foreach ($collection as $item) {
+    //            $return[] = $item->title;
+    //        }
+    //
+    //        return array_unique($return);
+    //    }
 
     private function getWebhooks(): Collection
     {
-        return $this->user
-            ->webhooks()
+        return $this->user->webhooks()
             ->leftJoin('webhook_webhook_trigger', 'webhook_webhook_trigger.webhook_id', 'webhooks.id')
             ->leftJoin('webhook_triggers', 'webhook_webhook_trigger.webhook_trigger_id', 'webhook_triggers.id')
             ->where('active', true)

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -515,8 +515,7 @@ trait AttachmentCollection
         if (false === $this->hasJoinedAttTables) {
             // join some extra tables:
             $this->hasJoinedAttTables = true;
-            $this->query
-                ->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
+            $this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
                 ->where(static function (EloquentBuilder $q1): void {
                     $q1->where('attachments.attachable_type', TransactionJournal::class);
                     // $q1->where('attachments.uploaded', true);

app/Helpers/Collector/GroupCollector.php

@@ -1063,9 +1063,8 @@ class GroupCollector implements GroupCollectorInterface
     private function startQuery(): void
     {
         // Log::debug('GroupCollector::startQuery');
-        $this->query = $this->user
-            // ->transactionGroups()
-            // ->leftJoin('transaction_journals', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
+        $this->query = $this->user// ->transactionGroups()
+        // ->leftJoin('transaction_journals', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
             ->transactionJournals()
             ->leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
             // join source transaction.
@@ -1099,8 +1098,7 @@ class GroupCollector implements GroupCollectorInterface
     private function startQueryForGroup(): void
     {
         // Log::debug('GroupCollector::startQuery');
-        $this->query = $this->userGroup
-            ->transactionJournals()
+        $this->query = $this->userGroup->transactionJournals()
             ->leftJoin('transaction_groups', 'transaction_journals.transaction_group_id', 'transaction_groups.id')
             // join source transaction.
             ->leftJoin('transactions as source', static function (JoinClause $join): void {

app/Helpers/Update/UpdateTrait.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Helpers\Update;
 use Carbon\Carbon;
 use FireflyIII\Services\FireflyIIIOrg\Update\UpdateRequestInterface;
 use FireflyIII\Services\FireflyIIIOrg\Update\UpdateResponse;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -46,7 +46,7 @@ trait UpdateTrait
 
         /** @var UpdateRequestInterface $checker */
         $checker       = app(UpdateRequestInterface::class);
-        $channelConfig = FireflyConfig::get('update_channel', 'stable');
+        $channelConfig = AppConfiguration::get('update_channel', 'stable');
         $channel       = (string) $channelConfig->data;
         $build         = Carbon::createFromTimestamp(config('firefly.build_time'), config('app.timezone'));
         $version       = config('firefly.version');

app/Http/Controllers/Account/ShowController.php

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

app/Http/Controllers/Admin/ConfigurationController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Admin;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\ConfigurationRequest;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -68,17 +68,17 @@ final class ConfigurationController extends Controller
 
         // all available configuration and their default value in case
         // they don't exist yet.
-        $singleUserMode        = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
-        $isDemoSite            = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $singleUserMode        = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $isDemoSite            = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $siteOwner             = config('firefly.site_owner');
 
-        $enableExchangeRates   = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data;
-        $useRunningBalance     = FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
-        $enableExternalMap     = FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
-        $enableExternalRates   = FireflyConfig::get('enable_external_rates', config('cer.download_enabled'))->data;
-        $allowWebhooks         = FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
-        $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false)->data;
-        $validUrlProtocols     = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $enableExchangeRates   = AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data;
+        $useRunningBalance     = AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data;
+        $enableExternalMap     = AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
+        $enableExternalRates   = AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data;
+        $allowWebhooks         = AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data;
+        $enableBatchProcessing = AppConfiguration::get('enable_batch_processing', false)->data;
+        $validUrlProtocols     = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
 
         return view('settings.configuration.index', [
             'subTitle'              => $subTitle,
@@ -107,18 +107,18 @@ final class ConfigurationController extends Controller
         Log::channel('audit')->info('User updates global configuration.', $data);
 
         // store config values
-        FireflyConfig::set('single_user_mode', $data['single_user_mode']);
+        AppConfiguration::set('single_user_mode', $data['single_user_mode']);
 
-        FireflyConfig::set('enable_exchange_rates', $data['enable_exchange_rates']);
-        FireflyConfig::set('use_running_balance', $data['use_running_balance']);
+        AppConfiguration::set('enable_exchange_rates', $data['enable_exchange_rates']);
+        AppConfiguration::set('use_running_balance', $data['use_running_balance']);
 
-        FireflyConfig::set('enable_external_map', $data['enable_external_map']);
-        FireflyConfig::set('enable_external_rates', $data['enable_external_rates']);
-        FireflyConfig::set('allow_webhooks', $data['allow_webhooks']);
-        FireflyConfig::set('enable_batch_processing', $data['enable_batch_processing']);
+        AppConfiguration::set('enable_external_map', $data['enable_external_map']);
+        AppConfiguration::set('enable_external_rates', $data['enable_external_rates']);
+        AppConfiguration::set('allow_webhooks', $data['allow_webhooks']);
+        AppConfiguration::set('enable_batch_processing', $data['enable_batch_processing']);
 
-        FireflyConfig::set('valid_url_protocols', $data['valid_url_protocols']);
-        FireflyConfig::set('is_demo_site', $data['is_demo_site']);
+        AppConfiguration::set('valid_url_protocols', $data['valid_url_protocols']);
+        AppConfiguration::set('is_demo_site', $data['is_demo_site']);
 
         // flash message
         session()->flash('success', (string) trans('firefly.configuration_updated'));

app/Http/Controllers/Admin/NotificationController.php

@@ -28,7 +28,7 @@ use FireflyIII\Events\Test\OwnerTestsNotificationChannel;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\NotificationRequest;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -45,14 +45,14 @@ final class NotificationController extends Controller
         $subTitleIcon                   = 'envelope-o';
 
         // notification settings:
-        $slackUrl                       = FireflyConfig::getEncrypted('slack_webhook_url', '')->data;
-        $pushoverAppToken               = FireflyConfig::getEncrypted('pushover_app_token', '')->data;
-        $pushoverUserToken              = FireflyConfig::getEncrypted('pushover_user_token', '')->data;
-        $ntfyServer                     = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
-        $ntfyTopic                      = FireflyConfig::getEncrypted('ntfy_topic', '')->data;
-        $ntfyAuth                       = FireflyConfig::get('ntfy_auth', false)->data;
-        $ntfyUser                       = FireflyConfig::getEncrypted('ntfy_user', '')->data;
-        $ntfyPass                       = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
+        $slackUrl                       = AppConfiguration::getEncrypted('slack_webhook_url', '')->data;
+        $pushoverAppToken               = AppConfiguration::getEncrypted('pushover_app_token', '')->data;
+        $pushoverUserToken              = AppConfiguration::getEncrypted('pushover_user_token', '')->data;
+        $ntfyServer                     = AppConfiguration::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
+        $ntfyTopic                      = AppConfiguration::getEncrypted('ntfy_topic', '')->data;
+        $ntfyAuth                       = AppConfiguration::get('ntfy_auth', false)->data;
+        $ntfyUser                       = AppConfiguration::getEncrypted('ntfy_user', '')->data;
+        $ntfyPass                       = AppConfiguration::getEncrypted('ntfy_pass', '')->data;
         $channels                       = config('notifications.channels');
         $forcedAvailability             = [];
 
@@ -60,7 +60,7 @@ final class NotificationController extends Controller
         $notifications                  = [];
         foreach (config('notifications.notifications.owner') as $key => $info) {
             if (true === $info['enabled']) {
-                $notifications[$key] = FireflyConfig::get(sprintf('notification_%s', $key), true)->data;
+                $notifications[$key] = AppConfiguration::get(sprintf('notification_%s', $key), true)->data;
             }
         }
 
@@ -97,19 +97,19 @@ final class NotificationController extends Controller
 
         foreach (config('notifications.notifications.owner') as $key => $info) {
             if (array_key_exists($key, $all)) {
-                FireflyConfig::set(sprintf('notification_%s', $key), $all[$key]);
+                AppConfiguration::set(sprintf('notification_%s', $key), $all[$key]);
             }
         }
         $variables = ['slack_webhook_url', 'pushover_app_token', 'pushover_user_token', 'ntfy_server', 'ntfy_topic', 'ntfy_user', 'ntfy_pass'];
         foreach ($variables as $variable) {
             if ('' === $all[$variable]) {
-                FireflyConfig::delete($variable);
+                AppConfiguration::delete($variable);
             }
             if ('' !== $all[$variable]) {
-                FireflyConfig::setEncrypted($variable, $all[$variable]);
+                AppConfiguration::setEncrypted($variable, $all[$variable]);
             }
         }
-        FireflyConfig::set('ntfy_auth', $all['ntfy_auth'] ?? false);
+        AppConfiguration::set('ntfy_auth', $all['ntfy_auth'] ?? false);
 
         session()->flash('success', (string) trans('firefly.notification_settings_saved'));
 
@@ -125,7 +125,7 @@ final class NotificationController extends Controller
         }
 
         /** @var int $lastNotification */
-        $lastNotification = FireflyConfig::get('last_test_notification', 123)->data;
+        $lastNotification = AppConfiguration::get('last_test_notification', 123)->data;
         if ((time() - $lastNotification) < 120) {
             session()->flash('error', (string) trans('firefly.test_rate_limited'));
 
@@ -150,7 +150,7 @@ final class NotificationController extends Controller
                 event(new OwnerTestsNotificationChannel($channel, $owner));
                 session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel]));
         }
-        FireflyConfig::set('last_test_notification', time());
+        AppConfiguration::set('last_test_notification', time());
 
         return redirect(route('settings.notification.index'));
     }

app/Http/Controllers/Admin/UpdateController.php

@@ -27,7 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Middleware\IsDemoUser;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -64,8 +64,8 @@ final class UpdateController extends Controller
     {
         $subTitle        = (string) trans('firefly.update_check_title');
         $subTitleIcon    = 'fa-star';
-        $permission      = FireflyConfig::get('permission_update_check', -1);
-        $channel         = FireflyConfig::get('update_channel', 'stable');
+        $permission      = AppConfiguration::get('permission_update_check', -1);
+        $channel         = AppConfiguration::get('update_channel', 'stable');
         $selected        = $permission->data;
         $channelSelected = $channel->data;
         $options         = [
@@ -99,9 +99,9 @@ final class UpdateController extends Controller
         $channel         = $request->get('update_channel');
         $channel         = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';
 
-        FireflyConfig::set('permission_update_check', $checkForUpdates);
-        FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
-        FireflyConfig::set('update_channel', $channel);
+        AppConfiguration::set('permission_update_check', $checkForUpdates);
+        AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp());
+        AppConfiguration::set('update_channel', $channel);
         session()->flash('success', (string) trans('firefly.configuration_updated'));
 
         return redirect(route('settings.update-check'));

app/Http/Controllers/Admin/UserController.php

@@ -31,7 +31,7 @@ use FireflyIII\Http\Requests\InviteUserFormRequest;
 use FireflyIII\Http\Requests\UserFormRequest;
 use FireflyIII\Models\InvitedUser;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
@@ -167,7 +167,7 @@ final class UserController extends Controller
         $subTitle       = (string) trans('firefly.user_administration');
         $subTitleIcon   = 'fa-users';
         $users          = $this->repository->all();
-        $singleUserMode = (bool) FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode = (bool) AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowInvites   = false;
         if (!$this->externalIdentity && $singleUserMode) {
             // also registration enabled.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Auth;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
@@ -122,7 +122,7 @@ final class ForgotPasswordController extends Controller
         }
 
         // is allowed to?
-        $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         $allowRegistration = true;
         $pageTitle         = (string) trans('firefly.forgot_pw_page_title');

app/Http/Controllers/Auth/LoginController.php

@@ -30,7 +30,7 @@ use FireflyIII\Events\Security\User\UserSuccessfullyLoggedIn;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
@@ -151,12 +151,12 @@ final class LoginController extends Controller
      */
     public function logout(Request $request): RedirectResponse|Response
     {
-        $authGuard  = config('firefly.authentication_guard');
-        $logoutUrl  = config('firefly.custom_logout_url');
+        $authGuard  = (string) config('firefly.authentication_guard');
+        $logoutUrl  = (string) config('firefly.custom_logout_url');
         if ('remote_user_guard' === $authGuard && '' !== $logoutUrl) {
             return redirect($logoutUrl);
         }
-        if ('remote_user_guard' === $authGuard && '' === $logoutUrl) {
+        if ('remote_user_guard' === $authGuard) {
             session()->flash('error', trans('firefly.cant_logout_guard'));
         }
 
@@ -199,7 +199,7 @@ final class LoginController extends Controller
         }
 
         // is allowed to register, etc.
-        $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowRegistration = true;
         $allowReset        = true;
         if (true === $singleUserMode && $count > 0) {

app/Http/Controllers/Auth/RegisterController.php

@@ -28,7 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Http\Controllers\CreateStuff;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
@@ -113,7 +113,7 @@ final class RegisterController extends Controller
      */
     public function showInviteForm(Request $request, string $code): Factory|\Illuminate\Contracts\View\View
     {
-        $isDemoSite        = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $isDemoSite        = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
         $repository        = app(UserRepositoryInterface::class);
         $allowRegistration = $this->allowedToRegister();
@@ -147,7 +147,7 @@ final class RegisterController extends Controller
      */
     public function showRegistrationForm(?Request $request = null): Factory|\Illuminate\Contracts\View\View
     {
-        $isDemoSite        = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $isDemoSite        = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $pageTitle         = (string) trans('firefly.register_page_title');
         $allowRegistration = $this->allowedToRegister();
 
@@ -171,7 +171,7 @@ final class RegisterController extends Controller
         $allowRegistration = true;
 
         try {
-            $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+            $singleUserMode = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         } catch (ContainerExceptionInterface|NotFoundExceptionInterface) {
             $singleUserMode = true;
         }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\ResetsPasswords;
@@ -124,7 +124,7 @@ final class ResetPasswordController extends Controller
         }
 
         // is allowed to register?
-        $singleUserMode    = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
+        $singleUserMode    = AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
         $allowRegistration = true;
         $pageTitle         = (string) trans('firefly.reset_pw_page_title');

app/Http/Controllers/Bill/IndexController.php

@@ -255,10 +255,7 @@ final class IndexController extends Controller
                     if (count($bill['paid_dates']) < count($bill['pay_dates'])) {
                         $count = count($bill['pay_dates']) - count($bill['paid_dates']);
                         if ($count > 0) {
-                            $avg                                                 = bcdiv(
-                                bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),
-                                '2'
-                            );
+                            $avg                                                 = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
                             $avg                                                 = bcmul($avg, (string) $count);
                             $sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);
                             Log::debug(

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controller
         if ($request->expectsJson()) {
             $array                           = $limit->toArray();
             // add some extra metadata:
-            $spentArr                        = $this->opsRepository->sumExpenses(
-                $limit->start_date,
-                $limit->end_date,
-                null,
-                new Collection()->push($budget),
-                $currency
-            );
+            $spentArr                        = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);
             $array['spent']                  = $spentArr[$currency->id]['sum'] ?? '0';
             $array['left_formatted']         = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));
             $array['amount_formatted']       = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);

app/Http/Controllers/Budget/IndexController.php

@@ -284,10 +284,7 @@ final class IndexController extends Controller
 
                 if (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {
                     $array['spent'][$currency->id]['spent']                   = $spentArr[$currency->id]['sum'];
-                    $array['spent'][$currency->id]['spent_outside']           = Steam::negative(bcsub(
-                        $spentInLimits[$currency->id],
-                        $spentArr[$currency->id]['sum']
-                    ));
+                    $array['spent'][$currency->id]['spent_outside']           = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));
                     $array['spent'][$currency->id]['currency_id']             = $currency->id;
                     $array['spent'][$currency->id]['currency_symbol']         = $currency->symbol;
                     $array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;

app/Http/Controllers/Chart/BudgetController.php

@@ -539,13 +539,7 @@ final class BudgetController extends Controller
             }
 
             // get spent amount in this period for this currency.
-            $sum                             = $this->opsRepository->sumExpenses(
-                $currentStart,
-                $currentEnd,
-                $accounts,
-                new Collection()->push($budget),
-                $currency
-            );
+            $sum                             = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
             $amount                          = Steam::positive($sum[$currency->id]['sum'] ?? '0');
             $chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);
 

app/Http/Controllers/Controller.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers;
 use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
@@ -72,7 +72,7 @@ abstract class Controller extends BaseController
     public function __construct()
     {
         // is site a demo site?
-        $isDemoSiteConfig = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site', false));
+        $isDemoSiteConfig = AppConfiguration::get('is_demo_site', config('firefly.configuration.is_demo_site', false));
         $isDemoSite       = (bool) $isDemoSiteConfig->data;
         View::share('IS_DEMO_SITE', $isDemoSite);
         View::share('DEMO_USERNAME', config('firefly.demo_username'));
@@ -91,7 +91,7 @@ abstract class Controller extends BaseController
         // is webhooks enabled?
         View::share(
             'featuringWebhooks',
-            true === config('firefly.feature_flags.webhooks') && true === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data
+            true === config('firefly.feature_flags.webhooks') && true === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data
         );
 
         // share custom auth guard info.

app/Http/Controllers/DebugController.php

@@ -34,7 +34,7 @@ use FireflyIII\Models\PeriodStatistic;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
@@ -118,7 +118,7 @@ final class DebugController extends Controller
 
         // also do some recalculations.
         Artisan::call('correction:recalculates-liabilities');
-        if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
+        if (true === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             AccountBalanceCalculator::recalculateAll(false);
         }
 
@@ -292,7 +292,7 @@ final class DebugController extends Controller
     {
         $userGuard      = config('auth.defaults.guard');
 
-        $config         = FireflyConfig::get('last_rt_job', 0);
+        $config         = AppConfiguration::get('last_rt_job', 0);
         $lastTime       = (int) $config->data;
         $lastCronjob    = 'never';
         $lastCronjobAgo = 'never';

app/Http/Controllers/ExchangeRates/IndexController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\ExchangeRates;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\View\View;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -46,7 +46,7 @@ final class IndexController extends Controller
 
             return $next($request);
         });
-        if (false === FireflyConfig::get('enable_exchange_rates', config('cer.enabled'))->data) {
+        if (false === AppConfiguration::get('enable_exchange_rates', config('cer.enabled'))->data) {
             throw new NotFoundHttpException();
         }
     }

app/Http/Controllers/Profile/OAuthController.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Profile;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
@@ -167,7 +167,7 @@ final class OAuthController extends Controller
 
     public function storeClient(Request $request): JsonResponse
     {
-        $validProtocols     = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols     = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         $this->validation->make($request->only(['name', 'redirect_uris', 'confidential']), [
             'name'          => ['required', 'string', 'max:255'],
             'redirect_uris' => ['required', sprintf('url:%s', $validProtocols)],
@@ -199,7 +199,7 @@ final class OAuthController extends Controller
     public function updateClient(Request $request, string $clientId): Client|Response
     {
         $client         = auth()->user()->oauthApps()->where('revoked', false)->find($clientId);
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         if (null === $client) {
             return new Response('', 404);
         }

app/Http/Controllers/System/InstallController.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Http\Controllers\System;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use Illuminate\Contracts\View\Factory;
@@ -76,8 +76,8 @@ final class InstallController extends Controller
         app('view')->share('FF_VERSION', config('firefly.version'));
 
         // index will set FF3 version.
-        FireflyConfig::set('ff3_version', (string) config('firefly.version'));
-        FireflyConfig::set('ff3_build_time', (int) config('firefly.build_time'));
+        AppConfiguration::set('ff3_version', (string) config('firefly.version'));
+        AppConfiguration::set('ff3_build_time', (int) config('firefly.build_time'));
 
         return view('install.index');
     }

app/Http/Controllers/Transaction/CreateController.php

@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Update\GroupCloneService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
@@ -136,7 +136,7 @@ final class CreateController extends Controller
         $optionalFields['external_url'] ??= false;
         $optionalFields['location']     ??= false;
         $optionalFields['location'] = $optionalFields['location']
-        && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
+        && true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
 
         // map info:
         $longitude                  = config('firefly.default_location.longitude');

app/Http/Controllers/Transaction/EditController.php

@@ -29,7 +29,7 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
@@ -116,7 +116,7 @@ final class EditController extends Controller
         $optionalFields['external_url'] ??= false;
         $optionalFields['location']     ??= false;
         $optionalFields['location'] = true === $optionalFields['location']
-        && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
+        && true === AppConfiguration::get('enable_external_map', config('firefly.enable_external_map'))->data;
 
         // map info voor v2:
         $longitude                  = config('firefly.default_location.longitude');

app/Http/Controllers/Webhooks/CreateController.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
@@ -58,7 +58,7 @@ final class CreateController extends Controller
      */
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning('User visits webhook create page, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Http/Controllers/Webhooks/DeleteController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -57,7 +57,7 @@ final class DeleteController extends Controller
 
     public function index(Webhook $webhook): Factory|View
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning('User visits webhook delete page, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Http/Controllers/Webhooks/EditController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -56,7 +56,7 @@ final class EditController extends Controller
 
     public function index(Webhook $webhook): Factory|View
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning('User visits webhook edit page, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Http/Controllers/Webhooks/IndexController.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
@@ -54,7 +54,7 @@ final class IndexController extends Controller
      */
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning('User visits webhook index page, but webhooks are DISABLED.');
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Http/Controllers/Webhooks/ShowController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Webhook;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Log;
@@ -56,7 +56,7 @@ final class ShowController extends Controller
 
     public function index(Webhook $webhook): Factory|View
     {
-        if (false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::channel('audit')->warning(sprintf('User visits webhook #%d page, but webhooks are DISABLED.', $webhook->id));
 
             throw new NotFoundHttpException('Webhooks are not enabled.');

app/Http/Middleware/Range.php

@@ -27,7 +27,7 @@ use Carbon\Carbon;
 use Closure;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Facades\Navigation;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
@@ -73,9 +73,9 @@ class Range
         app('view')->share('listLength', $pref);
 
         // share security message:
-        if (FireflyConfig::has('upgrade_security_message') && FireflyConfig::has('upgrade_security_level')) {
-            app('view')->share('upgrade_security_message', FireflyConfig::get('upgrade_security_message')->data);
-            app('view')->share('upgrade_security_level', FireflyConfig::get('upgrade_security_level')->data);
+        if (AppConfiguration::hasSetting('upgrade_security_message') && AppConfiguration::hasSetting('upgrade_security_level')) {
+            app('view')->share('upgrade_security_message', AppConfiguration::get('upgrade_security_message')->data);
+            app('view')->share('upgrade_security_level', AppConfiguration::get('upgrade_security_level')->data);
         }
     }
 

app/Http/Requests/NotificationRequest.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Requests;
 
 use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -66,7 +66,7 @@ class NotificationRequest extends FormRequest
      */
     public function rules(): array
     {
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         $rules          = [
             'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()],
             'ntfy_server'       => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'],

app/Http/Requests/PreferencesRequest.php

@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Requests;
 
 use FireflyIII\Rules\Admin\IsValidSlackOrDiscordUrl;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Request\ChecksLogin;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -40,7 +40,7 @@ class PreferencesRequest extends FormRequest
      */
     public function rules(): array
     {
-        $validProtocols = FireflyConfig::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
+        $validProtocols = AppConfiguration::get('valid_url_protocols', config('firefly.valid_url_protocols'))->data;
         $rules          = [
             'slack_webhook_url' => ['nullable', sprintf('url:%s', $validProtocols), 'min:1', new IsValidSlackOrDiscordUrl()],
             'ntfy_server'       => ['nullable', sprintf('url:%s', $validProtocols), 'min:1'],

app/Jobs/CreateAutoBudgetLimits.php

@@ -122,13 +122,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository      = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent           = $repository->sumExpenses(
-            $previousStart,
-            $previousEnd,
-            null,
-            new Collection()->push($autoBudget->budget),
-            $autoBudget->transactionCurrency
-        );
+        $spent           = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId      = $autoBudget->transaction_currency_id;
         $spentAmount     = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
@@ -218,13 +212,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         // if has one, calculate expenses and use that as a base.
         $repository    = app(OperationsRepositoryInterface::class);
         $repository->setUser($autoBudget->budget->user);
-        $spent         = $repository->sumExpenses(
-            $previousStart,
-            $previousEnd,
-            null,
-            new Collection()->push($autoBudget->budget),
-            $autoBudget->transactionCurrency
-        );
+        $spent         = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);
         $currencyId    = $autoBudget->transaction_currency_id;
         $spentAmount   = $spent[$currencyId]['sum'] ?? '0';
         Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));

app/Jobs/CreateRecurringTransactions.php

@@ -280,7 +280,7 @@ class CreateRecurringTransactions implements ShouldQueue
             return null;
         }
 
-        if ($journalCount > 0 && $this->force) {
+        if ($journalCount > 0) {
             Log::warning(sprintf('Already created %d groups for date %s but FORCED to continue.', $journalCount, $date->format('Y-m-d')));
         }
 

app/Listeners/Model/TransactionGroup/ProcessesNewTransactionGroup.php

@@ -28,7 +28,7 @@ use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Events\Model\TransactionGroup\CreatedSingleTransactionGroup;
 use FireflyIII\Events\Model\TransactionGroup\UserRequestedBatchProcessing;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
 
@@ -40,7 +40,7 @@ class ProcessesNewTransactionGroup implements ShouldQueue
     {
         Log::debug(sprintf('Running event handler for %s', get_class($event)));
 
-        $setting    = FireflyConfig::get('enable_batch_processing', false)->data;
+        $setting    = AppConfiguration::get('enable_batch_processing', false)->data;
         if (true === $event->flags->batchSubmission && true === $setting) {
             Log::debug('Will do nothing for event because it is part of a batch.');
 

app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php

@@ -18,7 +18,7 @@ use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use Illuminate\Support\Collection;
@@ -68,7 +68,7 @@ trait SupportsGroupProcessingTrait
     protected function recalculateRunningBalance(TransactionGroupEventObjects $objects): void
     {
         Log::debug('Now in recalculateRunningBalance');
-        if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
+        if (false === AppConfiguration::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {
             Log::debug('Running balance is disabled.');
 
             return;

app/Listeners/Model/Webhook/SendsWebhookMessages.php

@@ -27,7 +27,7 @@ namespace FireflyIII\Listeners\Model\Webhook;
 use FireflyIII\Events\Model\Webhook\WebhookMessagesRequestSending;
 use FireflyIII\Jobs\SendWebhookMessage;
 use FireflyIII\Models\WebhookMessage;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
 
@@ -36,7 +36,7 @@ class SendsWebhookMessages implements ShouldQueue
     public function handle(WebhookMessagesRequestSending $event): void
     {
         Log::debug(sprintf('Now in %s for %s', __METHOD__, get_class($event)));
-        if (false === config('firefly.feature_flags.webhooks') || false === FireflyConfig::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
+        if (false === config('firefly.feature_flags.webhooks') || false === AppConfiguration::get('allow_webhooks', config('firefly.allow_webhooks'))->data) {
             Log::debug('Webhook event handler is disabled, do not run sendWebhookMessages().');
 
             return;

app/Listeners/Security/System/ChecksForNewVersion.php

@@ -30,7 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Update\UpdateTrait;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
 use Psr\Container\ContainerExceptionInterface;
@@ -45,7 +45,7 @@ class ChecksForNewVersion implements ShouldQueue
         Log::debug(sprintf('Now in %s', __METHOD__));
 
         // should not check for updates:
-        $permission    = FireflyConfig::get('permission_update_check', -1);
+        $permission    = AppConfiguration::get('permission_update_check', -1);
         $value         = (int) $permission->data;
         if (1 !== $value) {
             Log::debug('Update check is not enabled.');
@@ -64,7 +64,7 @@ class ChecksForNewVersion implements ShouldQueue
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = FireflyConfig::get('last_update_check', Carbon::now()->getTimestamp());
+        $lastCheckTime = AppConfiguration::get('last_update_check', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last check time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -97,7 +97,7 @@ class ChecksForNewVersion implements ShouldQueue
         }
 
         session()->flash($level, $message);
-        FireflyConfig::set('last_update_check', Carbon::now()->getTimestamp());
+        AppConfiguration::set('last_update_check', Carbon::now()->getTimestamp());
     }
 
     /**
@@ -117,7 +117,7 @@ class ChecksForNewVersion implements ShouldQueue
         }
 
         /** @var Configuration $lastCheckTime */
-        $lastCheckTime = FireflyConfig::get('last_update_warning', Carbon::now()->getTimestamp());
+        $lastCheckTime = AppConfiguration::get('last_update_warning', Carbon::now()->getTimestamp());
         $now           = Carbon::now()->getTimestamp();
         $diff          = $now - $lastCheckTime->data;
         Log::debug(sprintf('Last warning time is %d, current time is %d, difference is %d', $lastCheckTime->data, $now, $diff));
@@ -133,6 +133,6 @@ class ChecksForNewVersion implements ShouldQueue
         Log::debug('Have warned about a new version in four weeks!');
 
         session()->flash('info', (string) trans('firefly.disabled_but_check'));
-        FireflyConfig::set('last_update_warning', Carbon::now()->getTimestamp());
+        AppConfiguration::set('last_update_warning', Carbon::now()->getTimestamp());
     }
 }

app/Listeners/Security/System/HandlesNewUserRegistration.php

@@ -36,7 +36,7 @@ use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
 use FireflyIII\Notifications\NotificationSender;
 use FireflyIII\Notifications\User\UserRegistration as UserRegistrationNotification;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use FireflyIII\User;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
@@ -112,7 +112,7 @@ class HandlesNewUserRegistration implements ShouldQueue
 
     private function sendAdminRegistrationNotification(User $user, OwnerNotifiable $owner): void
     {
-        $sendMail = (bool) FireflyConfig::get('notification_admin_new_reg', true)->data;
+        $sendMail = (bool) AppConfiguration::get('notification_admin_new_reg', true)->data;
         if (!$sendMail) {
             return;
         }
@@ -121,7 +121,7 @@ class HandlesNewUserRegistration implements ShouldQueue
 
     private function sendRegistrationMail(User $user): void
     {
-        $sendMail = (bool) FireflyConfig::get('notification_user_new_reg', true)->data;
+        $sendMail = (bool) AppConfiguration::get('notification_user_new_reg', true)->data;
         if (!$sendMail) {
             return;
         }

app/Listeners/Security/System/NotifiesAboutNewInvitation.php

@@ -32,7 +32,7 @@ use FireflyIII\Models\InvitedUser;
 use FireflyIII\Notifications\Admin\UserInvitation;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
 use FireflyIII\Notifications\NotificationSender;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
@@ -47,7 +47,7 @@ class NotifiesAboutNewInvitation implements ShouldQueue
 
     private function sendInvitationNotification(InvitedUser $invitee): void
     {
-        $sendMail = FireflyConfig::get('notification_invite_created', true)->data;
+        $sendMail = AppConfiguration::get('notification_invite_created', true)->data;
         if (false === $sendMail) {
             return;
         }

app/Listeners/Security/System/NotifiesOwnerAboutNewVersion.php

@@ -28,14 +28,14 @@ use FireflyIII\Events\Security\System\SystemFoundNewVersionOnline;
 use FireflyIII\Notifications\Admin\VersionCheckResult;
 use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
 use FireflyIII\Notifications\NotificationSender;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyIII\Support\Facades\AppConfiguration;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
 class NotifiesOwnerAboutNewVersion implements ShouldQueue
 {
     public function handle(SystemFoundNewVersionOnline $event): void
     {
-        $sendMail = FireflyConfig::get('notification_new_version', true)->data;
+        $sendMail = AppConfiguration::get('notification_new_version', true)->data;
         if (false === $sendMail) {
             return;
         }

app/Models/Account.php

@@ -28,6 +28,7 @@ use FireflyIII\Handlers\Observer\DeletedAccountObserver;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Attributes\Scope;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -82,7 +83,7 @@ class Account extends Model
             }
         }
 
-        throw new NotFoundHttpException();
+        throw new AuthenticationException();
     }
 
     public function accountMeta(): HasMany

app/Models/Attachment.php

@@ -27,6 +27,7 @@ use FireflyIII\Handlers\Observer\DeletedAttachmentObserver;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -80,7 +81,7 @@ class Attachment extends Model
             }
         }
 
-        throw new NotFoundHttpException();
+        throw new AuthenticationException();
     }
 
     /**

app/Models/AvailableBudget.php

@@ -28,6 +28,7 @@ use FireflyIII\Handlers\Observer\AvailableBudgetObserver;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -81,7 +82,7 @@ class AvailableBudget extends Model
             }
         }
 
-        throw new NotFoundHttpException();
+        throw new AuthenticationException();
     }
 
     public function transactionCurrency(): BelongsTo

app/Models/Bill.php

@@ -29,6 +29,7 @@ use FireflyIII\Handlers\Observer\BillObserver;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -100,7 +101,7 @@ class Bill extends Model
             }
         }
 
-        throw new NotFoundHttpException();
+        throw new AuthenticationException();
     }
 
     public function attachments(): MorphMany

app/Models/Budget.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Models;
 use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
 use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;
 use FireflyIII\User;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -68,7 +69,7 @@ class Budget extends Model
             }
         }
 
-        throw new NotFoundHttpException();
+        throw new AuthenticationException();
     }
 
     public function attachments(): MorphMany