From 3125171edf50d9442b2037744f71a236f6ec62c1 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:10:08 +0000
Subject: [PATCH] CLDC-3718: Sales - Remove Q10 (Will any buyers live in the
 property?) (25/26) (#2757)

---
 app/models/form/sales/subsections/setup.rb       | 2 +-
 config/locales/forms/2025/sales/setup.en.yml     | 6 ------
 spec/models/form/sales/subsections/setup_spec.rb | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index b0c7025c7..dd078c9f2 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -17,7 +17,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::DiscountedOwnershipType.new(nil, nil, self),
       (Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self) unless form.start_year_2025_or_later?),
       Form::Sales::Pages::BuyerCompany.new(nil, nil, self),
-      Form::Sales::Pages::BuyerLive.new(nil, nil, self),
+      (Form::Sales::Pages::BuyerLive.new(nil, nil, self) unless form.start_year_2025_or_later?),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
       Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
       (Form::Sales::Pages::BuyerInterview.new("buyer_interview_joint_purchase", nil, self, joint_purchase: true) if form.start_year_2024_or_later?),
diff --git a/config/locales/forms/2025/sales/setup.en.yml b/config/locales/forms/2025/sales/setup.en.yml
index 105d0ad0d..fcd942243 100644
--- a/config/locales/forms/2025/sales/setup.en.yml
+++ b/config/locales/forms/2025/sales/setup.en.yml
@@ -57,12 +57,6 @@ en:
             hint_text: ""
             question_text: "Is the buyer a company?"
 
-          buylivein:
-            page_header: ""
-            check_answer_label: "Buyers living in property"
-            hint_text: ""
-            question_text: "Will any buyers live in the property?"
-
           jointpur:
             page_header: ""
             check_answer_label: "Joint purchase"
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 1cd363105..7ed5546dd 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -96,7 +96,6 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
           shared_ownership_type
           discounted_ownership_type
           buyer_company
-          buyer_live
           joint_purchase
           number_joint_buyers
           buyer_interview_joint_purchase