diff --git a/app/components/data_protection_confirmation_banner_component.html.erb b/app/components/data_protection_confirmation_banner_component.html.erb index dfbd3bdf0..1e961f4f9 100644 --- a/app/components/data_protection_confirmation_banner_component.html.erb +++ b/app/components/data_protection_confirmation_banner_component.html.erb @@ -3,6 +3,6 @@

<%= header_text %>

- <%= second_row %> + <%= banner_text %> <% end %> <% end %> diff --git a/app/components/data_protection_confirmation_banner_component.rb b/app/components/data_protection_confirmation_banner_component.rb index 07b264b37..cbb8a501e 100644 --- a/app/components/data_protection_confirmation_banner_component.rb +++ b/app/components/data_protection_confirmation_banner_component.rb @@ -30,7 +30,7 @@ class DataProtectionConfirmationBannerComponent < ViewComponent::Base end end - def second_row + def banner_text if org_without_dpo? || user.is_dpo? govuk_link_to( link_text, diff --git a/app/models/user.rb b/app/models/user.rb index f6e90aca7..c9ef7cd02 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -188,7 +188,6 @@ private def send_data_protection_confirmation_reminder return unless FeatureToggle.new_data_protection_confirmation? return unless persisted? - return unless is_dpo_changed? return unless is_dpo? DataProtectionConfirmationMailer.send_confirmation_email(self).deliver_later