Merge pull request #214 from unboxed/update-pre-commencement

Show carriage returns in pre-commencement conditions
unboxed · Mar 6, 2024 · 4c2cab5 · 4c2cab5
2 parents 4ef24c2 + 8a2712c
commit 4c2cab5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/app/views/pre_commencement_condition_validation_requests/edit.html.erb b/app/views/pre_commencement_condition_validation_requests/edit.html.erb
@@ -28,14 +28,10 @@
       <hr class="govuk-section-break govuk-section-break--xl govuk-section-break--visible">
 
       <h3 class="govuk-heading-s">Condition: <%= "#{@validation_request["condition"]["title"]}" %></h3>
-      <p class="govuk-body">
-        <%= @validation_request["condition"]["text"] %>
-      </p>
+      <%= render(FormattedContentComponent.new(text: @validation_request["condition"]["text"])) %>
 
       <h3 class="govuk-heading-s">Reason</h3>
-      <p class="govuk-body">
-        <%= @validation_request["condition"]["reason"] %>
-      </p>
+      <%= render(FormattedContentComponent.new(text: @validation_request["condition"]["reason"])) %>
 
       <%= render 'form', request: @validation_request %>
     </div>

diff --git a/app/views/pre_commencement_condition_validation_requests/show.html.erb b/app/views/pre_commencement_condition_validation_requests/show.html.erb
@@ -12,14 +12,10 @@
       <% else %>
         <h1 class="govuk-heading-l">Response to pre-commencement condition validation change request</h1>
         <h2 class="govuk-heading-m">Condition <%= "#{@validation_request["condition"]["title"]}" %></h2>
-        <p class="govuk-body">
-          <%= @validation_request["condition"]["text"] %>
-        </p>
+        <%= render(FormattedContentComponent.new(text: @validation_request["condition"]["text"])) %>
 
         <h3 class="govuk-heading-s">Reason</h3>
-        <p class="govuk-body">
-          <%= @validation_request["condition"]["reason"] %>
-        </p>
+        <%= render(FormattedContentComponent.new(text: @validation_request["condition"]["reason"])) %>
 
         <% if @validation_request["approved"] == false %>
           <strong class="govuk-tag govuk-tag--red">