From d8f5291be87d2b1d23131b40c4098ac38a7c1579 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:53:09 +0000
Subject: [PATCH] Update open lettings form

---
 app/views/home/_upcoming_deadlines.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb
index 6b7e7aef2..c1fd7b7ca 100644
--- a/app/views/home/_upcoming_deadlines.html.erb
+++ b/app/views/home/_upcoming_deadlines.html.erb
@@ -1,6 +1,6 @@
 <h1 class="govuk-heading-l">Upcoming deadlines</h1>
 
-<% open_lettings_form = FormHandler.instance.in_crossover_period? ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %>
+<% open_lettings_form = FormHandler.instance.in_crossover_period? && FormHandler.instance.previous_lettings_form.submission_deadline > Time.zone.now ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %>
 <% formatted_deadline = open_lettings_form.submission_deadline.strftime("%A %-d %B %Y") %>
 <% if FormHandler.instance.in_crossover_period? && open_lettings_form.submission_deadline > Time.zone.now %>
   <p class="govuk-body govuk-body-m"><strong>End of year deadline - <%= formatted_deadline %>:</strong> Deadline to submit logs for tenancies starting between <%= open_lettings_form.start_date.to_formatted_s(:govuk_date) %> to <%= collection_end_date(open_lettings_form.start_date).to_formatted_s(:govuk_date) %></p>