From 7d817c1b3d313abb55e9ef6ad4f39cbf006e42fa Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Fri, 6 Sep 2024 08:53:04 +0100
Subject: [PATCH] Clean user error messages

---
 app/helpers/user_helper.rb    | 15 +++++++++++++++
 app/views/users/edit.html.erb |  1 +
 2 files changed, 16 insertions(+)

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 6b11fc4d4..06fe2bc7d 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -41,4 +41,19 @@ module UserHelper
 
     "You’re moving #{user.name} from #{user.organisation.name} to #{new_organisation.name}. #{log_reassignment_text}"
   end
+
+  def remove_attributes_from_error_messages(user)
+    modified_errors = []
+
+    user.errors.each do |error|
+      cleaned_message = error.type.gsub(error.attribute.to_s.humanize, "").strip
+      modified_errors << [error.attribute, cleaned_message]
+    end
+
+    user.errors.clear
+
+    modified_errors.each do |attribute, message|
+      user.errors.add(attribute, message)
+    end
+  end
 end
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0651bc6fe..4c610c22a 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -7,6 +7,7 @@
 <%= form_for(@user, as: :user, html: { method: :patch }) do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
+      <% remove_attributes_from_error_messages(@user) %>
       <%= f.govuk_error_summary %>
 
       <h1 class="govuk-heading-l">