From b54259b59c819188cd7908b5f00d576f9d085281 Mon Sep 17 00:00:00 2001
From: samyou-softwire <samuel.young@softwire.com>
Date: Mon, 9 Mar 2026 14:15:38 +0000
Subject: [PATCH] CLDC-4266: Revert "Reference UPRN in clear button for
 newbuilds"

This reverts commit c2f88d5da40a33170d5a49a8ed3dfd49d4c0dcdf.

This reverts commit 830e8b802b694b122633f695cd34d738dde5880e.
---
 app/helpers/form_page_helper.rb                    |  8 --------
 app/models/lettings_log.rb                         | 12 ++----------
 app/views/form/guidance/_address_fallback.html.erb |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/helpers/form_page_helper.rb b/app/helpers/form_page_helper.rb
index 850baab4f..98b9bb8d5 100644
--- a/app/helpers/form_page_helper.rb
+++ b/app/helpers/form_page_helper.rb
@@ -55,12 +55,4 @@ module FormPageHelper
       question.date_example_override(log) || "For example, #{date_mid_collection_year_formatted(log.startdate).tr(' ', '/')}",
     ].compact.join("<br><br>").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 6c9279891..fb4866fc0 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -815,20 +815,12 @@ class LettingsLog < Log
     "lettings_log"
   end
 
-  def newbuild?
-    rsnvac == 15
-  end
-
-  def was_newbuild?
-    rsnvac_was == 15
-  end
-
   def changed_to_newbuild?
-    newbuild? && !was_newbuild?
+    rsnvac == 15 && rsnvac_was != 15
   end
 
   def changed_from_newbuild?
-    !newbuild? && was_newbuild?
+    rsnvac != 15 && 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 26649c325..4ee0bd608 100644
--- a/app/views/form/guidance/_address_fallback.html.erb
+++ b/app/views/form/guidance/_address_fallback.html.erb
@@ -1,3 +1,3 @@
 <div class="govuk-button-group">
-  <%= govuk_link_to clear_address_text(@log), address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
+  <%= govuk_link_to "Clear address and search instead", address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
 </div>