Improve account recovery request form

app/frontend/styles/application.scss

@@ -52,7 +52,7 @@ $govuk-new-link-styles: true;
 @import "autocomplete";
 @import "banner";
 @import "box";
-@import "button";
+@import "link_button";
 @import "notification_banner";
 @import "card";
 @import "conditions-list";

app/views/candidate_interface/account_recovery/new.html.erb

@@ -4,22 +4,21 @@
                   I18n.t('page_titles.account_recovery', email: current_candidate.previous_account_email_address)
                 end %>
 
-<% content_for :title, page_title %>
+<% content_for :title, title_with_error_prefix(page_title, @account_recovery.errors.any?) %>
 <% content_for :before_content do %>
   <%= govuk_back_link(
     text: 'Back',
     href: new_candidate_interface_account_recovery_request_path,
   ) %>
 <% end %>
 
-<h1 class="govuk-heading-l">
-  <%= page_title %>
-</h1>
-
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= form_with model: @account_recovery, url: candidate_interface_account_recovery_create_path do |f| %>
       <%= f.govuk_error_summary %>
+
+      <h1 class="govuk-heading-l"><%= page_title %></h1>
+
       <%= f.govuk_text_field :code, label: { text: t('.form.code.label'), size: 'm' }, width: 20 %>
 
       <%= f.govuk_submit %>

app/views/candidate_interface/account_recovery_requests/new.html.erb

@@ -1,4 +1,4 @@
-<% content_for :title, t('page_titles.account_recovery_request') %>
+<% content_for :title, title_with_error_prefix(t('page_titles.account_recovery_request'), @account_recovery_request.errors.any?) %>
 <% content_for :before_content do %>
   <%= govuk_back_link(
     text: 'Back',
@@ -8,15 +8,15 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <h1 class="govuk-heading-l">
-      <%= t('page_titles.account_recovery_request') %>
-    </h1>
-
-    <p class="govuk-body"><%= t('.form.content') %> </p>
-
     <%= form_with model: @account_recovery_request, url: candidate_interface_account_recovery_requests_path do |f| %>
       <%= f.govuk_error_summary %>
 
+      <h1 class="govuk-heading-l">
+        <%= t('page_titles.account_recovery_request') %>
+      </h1>
+
+      <p class="govuk-body"><%= t('.form.content') %> </p>
+
       <%= f.govuk_text_field :previous_account_email_address,
                               label: { text: t('.form.email_address.label'), size: 'm' },
                               width: 20 %>

app/views/candidate_interface/application_choices/index.html.erb

@@ -1,7 +1,6 @@
 <%= content_for :title, t('page_titles.your_applications') %>
 <%= render ServiceInformationBanner.new(namespace: :candidate) %>
 
-
 <% if current_candidate.recoverable? %>
   <%= govuk_notification_banner(title_text: t('account_recovery_banner.title'), success: false) do |nb| %>
 

config/locales/candidate_interface/account_recovery.yml

@@ -6,5 +6,3 @@ en:
           code:
             label: Code
           request_a_new_code: Request a new code
-      create:
-        test: test

spec/forms/candidate_interface/account_recovery_form_spec.rb

@@ -19,10 +19,10 @@
   let(:account_recovery_request_code) do
     create(
       :account_recovery_request_code,
-      code: '123456',
+      code: '001212',
     )
   end
-  let(:code) { '123456' }
+  let(:code) { '001212' }
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:code) }
@@ -46,7 +46,7 @@
       let(:account_recovery_request_code) do
         create(
           :account_recovery_request_code,
-          code: '123456',
+          code: '001212',
           created_at: 2.hours.ago,
         )
       end