diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb
index 98b9bb8d5..850baab4f 100644
--- a/app/helpers/form_page_helper.rb
+++ b/app/helpers/form_page_helper.rb
@@ -55,4 +55,12 @@ module FormPageHelper
question.date_example_override(log) || "For example, #{date_mid_collection_year_formatted(log.startdate).tr(' ', '/')}",
].compact.join("
").html_safe
end
+
+ def clear_address_text(log)
+ if log.lettings? && log.newbuild?
+ "Clear address and search by UPRN instead"
+ else
+ "Clear address and search instead"
+ end
+ end
end
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index fb4866fc0..66aa6bd04 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -815,12 +815,16 @@ class LettingsLog < Log
"lettings_log"
end
+ def newbuild?
+ rsnvac == 15
+ end
+
def changed_to_newbuild?
- rsnvac == 15 && rsnvac_was != 15
+ newbuild? && rsnvac_was != 15
end
def changed_from_newbuild?
- rsnvac != 15 && rsnvac_was == 15
+ !newbuild? && rsnvac_was == 15
end
def is_address_asked?
diff --git a/app/views/form/guidance/_address_fallback.html.erb b/app/views/form/guidance/_address_fallback.html.erb
index 4ee0bd608..26649c325 100644
--- a/app/views/form/guidance/_address_fallback.html.erb
+++ b/app/views/form/guidance/_address_fallback.html.erb
@@ -1,3 +1,3 @@