Move q19, add inference and remove redundant hint text in 2025

app/models/form/sales/pages/property_number_of_bedrooms.rb

@@ -2,6 +2,7 @@ class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_bedrooms"
+    @depends_on = [{"is_beds_inferred?" => false }]
   end
 
   def questions

app/models/form/sales/subsections/property_information.rb

@@ -9,9 +9,10 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
   def pages
     @pages ||= [
       (uprn_questions if form.start_date.year >= 2024),
+      (Form::Sales::Pages::PropertyUnitType.new(nil, nil, self) if form.start_year_2025_or_later?),
       Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
       Form::Sales::Pages::AboutPriceValueCheck.new("about_price_bedrooms_value_check", nil, self),
-      Form::Sales::Pages::PropertyUnitType.new(nil, nil, self),
+      (Form::Sales::Pages::PropertyUnitType.new(nil, nil, self) unless form.start_year_2025_or_later?),
       Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_property_type_value_check", nil, self),
       Form::Sales::Pages::PercentageDiscountValueCheck.new("percentage_discount_proptype_value_check", nil, self),
       Form::Sales::Pages::PropertyBuildingType.new(nil, nil, self),

app/models/sales_log.rb

@@ -396,6 +396,10 @@ class SalesLog < Log
     proptype == 2
   end
 
+  def is_beds_inferred?
+    form.start_year_2025_or_later? && is_bedsit?
+  end
+
   def shared_ownership_scheme?
     ownershipsch == 1
   end

config/locales/forms/2025/sales/property_information.en.yml

@@ -69,7 +69,7 @@ en:
           beds:
             page_header: ""
             check_answer_label: "Number of bedrooms"
-            hint_text: "A bedsit has 1 bedroom."
+            hint_text: ""
             question_text: "How many bedrooms does the property have?"
 
           proptype: