From d36feebb71c51ec5e4209fb95573b3e474a3a961 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Mon, 30 Oct 2023 19:11:02 +0100
Subject: [PATCH] Fix #8106

---
 app/Transformers/BillTransformer.php    | 2 +-
 app/Transformers/V2/BillTransformer.php | 6 +++---
 resources/views/list/bills.twig         | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php
index 9ea69657eb..8c6a9b5e14 100644
--- a/app/Transformers/BillTransformer.php
+++ b/app/Transformers/BillTransformer.php
@@ -86,7 +86,7 @@ class BillTransformer extends AbstractTransformer
         foreach ($payDates as $string) {
             $payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString();
         }
-        $nextExpectedMatch = '';
+        $nextExpectedMatch = null;
         if (null !== ($payDates[0] ?? null)) {
             $nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $payDates[0], config('app.timezone'))->toAtomString();
         }
diff --git a/app/Transformers/V2/BillTransformer.php b/app/Transformers/V2/BillTransformer.php
index f5b87e21fe..2a9fa405f7 100644
--- a/app/Transformers/V2/BillTransformer.php
+++ b/app/Transformers/V2/BillTransformer.php
@@ -201,7 +201,7 @@ class BillTransformer extends AbstractTransformer
         // date for currency conversion
         /** @var Carbon|null $startParam */
         $startParam = $this->parameters->get('start');
-        /** @var Carbon|null $start */
+        /** @var Carbon|null $date */
         $date = null === $startParam ? today() : clone $startParam;
 
 
@@ -290,8 +290,8 @@ class BillTransformer extends AbstractTransformer
     /**
      * Returns the latest date in the set, or start when set is empty.
      *
-     * @param Collection $dates
-     * @param Carbon     $default
+     * @param array  $dates
+     * @param Carbon $default
      *
      * @return Carbon
      */
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index d930f54681..5b09397864 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -80,7 +80,9 @@
                             {{ trans('firefly.not_expected_period') }}
                         </td>
                         <td class="expected_in_period hidden-sm hidden-xs">
-                            {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
+                            {% if entry.next_expected_match %}
+                                {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
+                            {% endif %}
                         </td>
                     {% endif %}
 
@@ -116,7 +118,9 @@
                             {% endfor %}
                         </td>
                         <td class="expected_in_period hidden-sm hidden-xs">
-                            {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
+                            {% if entry.next_expected_match %}
+                                {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
+                            {% endif %}
                         </td>
                     {% endif %}
                     {# bill is not active #}