diff --git a/app/presenters/registrant_presenter.rb b/app/presenters/registrant_presenter.rb
index af523a29e..69dffddfc 100644
--- a/app/presenters/registrant_presenter.rb
+++ b/app/presenters/registrant_presenter.rb
@@ -1,5 +1,5 @@
class RegistrantPresenter
- delegate :name, :ident, :email, to: :registrant
+ delegate :name, :ident, :email, :priv?, to: :registrant
def initialize(registrant:, view:)
@registrant = registrant
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
index 4db2d2d9a..37081076c 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
@@ -12,13 +12,13 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> registreerija vahetuseks.
Uue registreerija andmed:
Nimi: <%= @registrant.name %>
-<% if @params[:registrant_priv] %>
-Isikukood: <%= @registrant.ident %>
+<% if @registrant.priv? %>
+ Isikukood: <%= @registrant.ident %>
<% else %>
-Äriregistrikood: <%= @registrant.ident %>
+ Äriregistrikood: <%= @registrant.ident %>
<% end %>
-Tänav: <%= @params[:registrant_street] %>
-Linn: <%= @params[:registrant_city] %>
+Tänav: <%= @registrant.street %>
+Linn: <%= @registrant.city %>
Riik: <%= @params[:registrant_country] %>
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
index 863ef9fa4..5cbb47b7c 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
@@ -9,13 +9,13 @@ Veebileht: <%= @registrar.url %>
Uue registreerija andmed:
Nimi: <%= @registrant.name %>
-<% if @params[:registrant_priv] %>
+<% if @registrant.priv? %>
Isikukood: <%= @registrant.ident %>
<% else %>
Äriregistrikood: <%= @registrant.ident %>
<% end %>
-Tänav: <%= @params[:registrant_street] %>
-Linn: <%= @params[:registrant_city] %>
+Tänav: <%= @registrant.street %>
+Linn: <%= @registrant.city %>
Riik: <%= @params[:registrant_country] %>
Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
diff --git a/spec/presenters/registrant_presenter_spec.rb b/spec/presenters/registrant_presenter_spec.rb
index 7e29196de..014dbd54d 100644
--- a/spec/presenters/registrant_presenter_spec.rb
+++ b/spec/presenters/registrant_presenter_spec.rb
@@ -24,4 +24,11 @@ RSpec.describe RegistrantPresenter do
expect(presenter.email).to eq('test email')
end
end
+
+ describe '#priv?' do
+ it 'delegates to registrant' do
+ expect(registrant).to receive(:priv?).and_return('test')
+ expect(presenter.priv?).to eq('test')
+ end
+ end
end