From 2c1df667378038891e3a86a3ddaa68592af609a3 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:43:10 +0100
Subject: [PATCH] Use helper method here also

---
 .../_merge_request_list.html.erb              | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/views/merge_requests/_merge_request_list.html.erb b/app/views/merge_requests/_merge_request_list.html.erb
index 99577bdc3..e048472a7 100644
--- a/app/views/merge_requests/_merge_request_list.html.erb
+++ b/app/views/merge_requests/_merge_request_list.html.erb
@@ -25,30 +25,18 @@
       <% @merge_requests.each do |merge_request| %>
         <%= table.with_body do |body| %>
           <%= body.with_row do |row| %>
-            <% if merge_request.absorbing_organisation_name.blank? %>
-              <% row.with_cell(text: "You didn't answer this question",
-                               html_attributes: {
-                                  scope: "row",
-                                  class: "app-!-colour-muted",
-                               }) %>
-            <% else %>
-              <% row.with_cell(text: merge_request.absorbing_organisation_name) %>
+            <%= row.with_cell(html_attributes: { scope: "row" }) do %>
+              <%= display_value_or_placeholder(merge_request.absorbing_organisation_name) %>
             <% end %>
             <% merge_date = merge_request.merge_date %>
-            <% if merge_date.nil? %>
-              <% row.with_cell(text: "You didn't answer this question",
-                               html_attributes: {
-                                 scope: "row",
-                                 class: "app-!-colour-muted",
-                               }) %>
-            <% else %>
-              <% row.with_cell(text: merge_date.strftime("%d %B %Y")) %>
+            <%= row.with_cell(html_attributes: { scope: "row" }) do %>
+              <%= display_value_or_placeholder(merge_date&.strftime("%d %B %Y")) %>
             <% end %>
             <% row.with_cell(text: status_tag(merge_request.status)) %>
             <% row.with_cell(html_attributes: {
               scope: "row",
             }) do %>
-              <%= govuk_link_to("View details", "/merge-request/#{merge_request.id}") %>
+              <%= govuk_link_to("View details", merge_request_path(merge_request.id)) %>
             <% end %>
           <% end %>
         <% end %>