From a52898dd481a33e873e0cb019e41029d374ff823 Mon Sep 17 00:00:00 2001
From: Samuel Young <samuel.young@softwire.com>
Date: Mon, 14 Jul 2025 16:14:43 +0100
Subject: [PATCH] update copy on password reset page if user is unconfirmed

---
 app/controllers/auth/passwords_controller.rb                | 3 ++-
 .../devise/passwords/reset_resend_confirmation.html.erb     | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index 9a281df16..7db9cfb48 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -4,6 +4,7 @@ class Auth::PasswordsController < Devise::PasswordsController
   def reset_confirmation
     self.resource = resource_class.new
     @email = params["email"]
+    @unconfirmed = params["unconfirmed"] == "true"
     if @email.blank?
       resource.errors.add :email, I18n.t("validations.email.blank")
       render "devise/passwords/new", status: :unprocessable_entity
@@ -66,7 +67,7 @@ protected
   end
 
   def after_sending_reset_password_instructions_path_for(_resource)
-    account_password_reset_confirmation_path(email: params.dig("user", "email"))
+    account_password_reset_confirmation_path(email: params.dig("user", "email"), unconfirmed: !resource.confirmed?)
   end
 
   def after_resetting_password_path_for(resource)
diff --git a/app/views/devise/passwords/reset_resend_confirmation.html.erb b/app/views/devise/passwords/reset_resend_confirmation.html.erb
index b89717844..106f4d87e 100644
--- a/app/views/devise/passwords/reset_resend_confirmation.html.erb
+++ b/app/views/devise/passwords/reset_resend_confirmation.html.erb
@@ -6,7 +6,11 @@
       <%= content_for(:title) %>
     </h1>
 
-    <p class="govuk-body">We’ve sent a link to reset your password to <strong><%= @email %></strong>.</p>
+    <% if @unconfirmed %>
+      <p class="govuk-body">We’ve sent a link to confirm your email address to <strong><%= @email %></strong>. This will complete your registration onto the CORE service.</p>
+    <% else %>
+      <p class="govuk-body">We’ve sent a link to reset your password to <strong><%= @email %></strong>.</p>
+    <% end %>
     <p class="govuk-body">You’ll only receive this link if your email address already exists in our system.</p>
     <p class="govuk-body">If you don’t receive the email within 5 minutes, check your spam or junk folders. Try again if you still haven’t received the email.</p>
   </div>