From 7ae94372248c1a6b99b2a55eed5020fd7acde55e Mon Sep 17 00:00:00 2001
From: Jack S <jacopo.scotti@softwire.com>
Date: Wed, 22 Mar 2023 10:10:22 +0000
Subject: [PATCH] Update CYA page

---
 ..._answers_summary_list_card_component.html.erb | 16 +++++++++++-----
 .../form/_check_answers_summary_list.html.erb    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/components/check_answers_summary_list_card_component.html.erb b/app/components/check_answers_summary_list_card_component.html.erb
index 3b4c4978a..31c3bffac 100644
--- a/app/components/check_answers_summary_list_card_component.html.erb
+++ b/app/components/check_answers_summary_list_card_component.html.erb
@@ -12,16 +12,22 @@
           <% summary_list.row do |row| %>
             <% row.key { get_question_label(question) } %>
             <% row.value do %>
-              <span class="govuk-!-margin-right-4"><%= get_answer_label(question) %></span>
+              <%= simple_format(
+                get_answer_label(question),
+                wrapper_tag: "span",
+                class: "govuk-!-margin-right-4",
+              ) %>
 
               <% extra_value = question.get_extra_check_answer_value(log) %>
 
-              <% if extra_value %>
-                <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= extra_value %></span>
+              <% if extra_value && question.answer_label(log).present? %>
+                <%= simple_format(
+                  extra_value,
+                  wrapper_tag: "span",
+                  class: "govuk-!-font-weight-regular app-!-colour-muted",
+                ) %>
               <% end %>
 
-              <br>
-
               <% question.get_inferred_answers(log).each do |inferred_answer| %>
                 <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
               <% end %>
diff --git a/app/views/form/_check_answers_summary_list.html.erb b/app/views/form/_check_answers_summary_list.html.erb
index 71fe9cd97..653cd610d 100644
--- a/app/views/form/_check_answers_summary_list.html.erb
+++ b/app/views/form/_check_answers_summary_list.html.erb
@@ -9,7 +9,7 @@
             class: "govuk-!-margin-right-4",
           ) %>
         <% extra_value = question.get_extra_check_answer_value(@log) %>
-        <% if extra_value && question.answer_label(lettings_log, current_user).present? %>
+        <% if extra_value && question.answer_label(@log, current_user).present? %>
           <%= simple_format(
             extra_value,
             wrapper_tag: "span",