Use error message property to replace error component

alphagov · Feb 6, 2024 · 6717629 · 6717629
1 parent af54846
commit 6717629
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb
@@ -23,16 +23,19 @@
              method: "post",
              data: data_attrs) do %>
   <% legend_text = render 'govuk_publishing_components/components/title', title: @content_item.title %>
+  <% description_text = render 'govuk_publishing_components/components/govspeak' do %>
+    <% raw(@content_item.description) %>
+  <% end %>
+
   <%= render "govuk_publishing_components/components/fieldset", legend_text: legend_text do %>
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
-        <%= render 'govuk_publishing_components/components/govspeak', {} do %>
-          <%= raw(@content_item.description) %>
-        <% end %>
-        <% if @error %>
-          <%= render "components/error_message", text: t('service_sign_in.error.option') %>
-        <% end %>
-        <%= render "govuk_publishing_components/components/radio", id_prefix: @content_item.options_id, name: "option", items: @content_item.options %>
+        <%= render "govuk_publishing_components/components/radio",
+          id_prefix: @content_item.options_id,
+          name: "option",
+          error_message: (t('service_sign_in.error.option') if @error),
+          description: description_text,
+          items: @content_item.options %>
       </div>
     </div>
   <% end %>