From 0e0eeb736fd629439c75ed01a66831a5a8aaf67c Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Mon, 8 Apr 2024 07:45:58 +0200
Subject: [PATCH] Point to single source of truth for view name.

---
 app/Http/Controllers/Account/ShowController.php | 2 +-
 app/Http/Controllers/Controller.php             | 2 +-
 config/firefly.php                              | 1 -
 resources/views/partials/debug-table.twig       | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index 8669025c55..454916fbb3 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -106,7 +106,7 @@ class ShowController extends Controller
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
 
         // if layout = v2, overrule the page title.
-        if ('v1' !== config('firefly.layout')) {
+        if ('v1' !== config('view.layout')) {
             $subTitle = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]);
         }
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index a004c03b61..772020f672 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -70,7 +70,7 @@ abstract class Controller extends BaseController
         $logoutUrl        = config('firefly.custom_logout_url');
 
         // overrule v2 layout back to v1.
-        if ('true' === request()->get('force_default_layout') && 'v2' === config('firefly.layout')) {
+        if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             app('view')->getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
 
diff --git a/config/firefly.php b/config/firefly.php
index aa2bbf64af..6d9ab5859a 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -206,7 +206,6 @@ return [
 
     // web configuration:
     'trusted_proxies'              => env('TRUSTED_PROXIES', ''),
-    'layout'                       => envNonEmpty('FIREFLY_III_LAYOUT', 'v1'),
 
     // map configuration
     'default_location'             => [
diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig
index f4526e8581..4b35f4bfac 100644
--- a/resources/views/partials/debug-table.twig
+++ b/resources/views/partials/debug-table.twig
@@ -72,8 +72,8 @@
     </tr>
     <tr>
         <td>Layout</td>
-        <td>{{ config('firefly.layout') }}
-            {% if 'v2' == config('firefly.layout') %}
+        <td>{{ config('view.layout') }}
+            {% if 'v2' == config('view.layout') %}
                 <!-- .eOxNZAmyGz6CXMyf -->
             {% endif %}
         </td>