From 3c4097e527f9452e1b910856b561dba4309d9ce0 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Mon, 14 Nov 2022 13:59:10 +0000
Subject: [PATCH] refactor: respond to PR comments 1

---
 app/helpers/schemes_helper.rb                      | 8 --------
 app/views/locations/toggle_active.html.erb         | 2 +-
 app/views/locations/toggle_active_confirm.html.erb | 2 +-
 app/views/schemes/show.html.erb                    | 3 ++-
 app/views/schemes/toggle_active.html.erb           | 2 +-
 app/views/schemes/toggle_active_confirm.html.erb   | 2 +-
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index c2593928e..0a042528b 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -23,12 +23,4 @@ module SchemesHelper
     end
     base_attributes
   end
-
-  def availability_text(scheme)
-    base_text = "Available from #{scheme.available_from.to_formatted_s(:govuk_date)}"
-    if scheme.deactivation_date.present?
-      base_text += "\nDeactivation date #{scheme.deactivation_date.to_formatted_s(:govuk_date)}"
-    end
-    base_text
-  end
 end
diff --git a/app/views/locations/toggle_active.html.erb b/app/views/locations/toggle_active.html.erb
index 96cda6daa..131cbda43 100644
--- a/app/views/locations/toggle_active.html.erb
+++ b/app/views/locations/toggle_active.html.erb
@@ -28,7 +28,7 @@
                                         **basic_conditional_html_attributes({ "deactivation_date" => %w[other] }, "location") do %>
                                           <%= f.govuk_date_field :deactivation_date,
                                                         legend: { text: "Date", size: "m" },
-                                                        hint: { text: "For example, 27 3 2008" },
+                                                        hint: { text: "For example, 27 3 2022" },
                                                         width: 20 %>
                                                         <% end %>
         <% end %>
diff --git a/app/views/locations/toggle_active_confirm.html.erb b/app/views/locations/toggle_active_confirm.html.erb
index 452d66e48..c9c58f331 100644
--- a/app/views/locations/toggle_active_confirm.html.erb
+++ b/app/views/locations/toggle_active_confirm.html.erb
@@ -4,7 +4,7 @@
      <% end %>
    <h1 class="govuk-heading-l">
      <span class="govuk-caption-l"><%= @location.postcode %></span>
-     <%= "This change will affect #{@location.lettings_logs.count} logs" %>
+     This change will affect <%= @location.lettings_logs.count %> logs
    </h1>
    <%= govuk_warning_text text: I18n.t("warnings.location.deactivation.review_logs") %>
    <%= f.hidden_field :confirm, value: true %>
diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb
index b4c90a4b8..de80e8897 100644
--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@@ -30,4 +30,5 @@
     <%= govuk_button_link_to "Deactivate this scheme", scheme_deactivate_path(@scheme), warning: true %>
   <% else %>
     <%= govuk_button_link_to "Reactivate this scheme", scheme_reactivate_path(@scheme) %>
-  <% end %><% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/schemes/toggle_active.html.erb b/app/views/schemes/toggle_active.html.erb
index d39d2d353..37a73ddeb 100644
--- a/app/views/schemes/toggle_active.html.erb
+++ b/app/views/schemes/toggle_active.html.erb
@@ -25,7 +25,7 @@
                                  **basic_conditional_html_attributes({ "deactivation_date" => %w[other] }, "scheme") do %>
           <%= f.govuk_date_field :deactivation_date,
                                  legend: { text: "Date", size: "m" },
-                                 hint: { text: "For example, 27 3 2008" },
+                                 hint: { text: "For example, 27 3 2022" },
                                  width: 20 %>
         <% end %>
       <% end %>
diff --git a/app/views/schemes/toggle_active_confirm.html.erb b/app/views/schemes/toggle_active_confirm.html.erb
index bc88dc93e..596245294 100644
--- a/app/views/schemes/toggle_active_confirm.html.erb
+++ b/app/views/schemes/toggle_active_confirm.html.erb
@@ -6,7 +6,7 @@
   <% end %>
   <h1 class="govuk-heading-l">
     <span class="govuk-caption-l"><%= @scheme.service_name %></span>
-    <%= "This change will affect #{@scheme.lettings_logs.count} logs" %>
+    This change will affect <%= @scheme.lettings_logs.count %> logs
   </h1>
   <%= govuk_warning_text text: I18n.t("warnings.scheme.deactivation.review_logs") %>
   <%= f.hidden_field :confirm, value: true %>