app/models/form/lettings/pages/net_income_value_check.rb

@@ -1,9 +1,9 @@
 class Form::Lettings::Pages::NetIncomeValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, person_index: nil)
-    super(id, hsh, subsection)
+  def initialize(id, hsh, subsection)
+    super
+    @id = "net_income_value_check"
     @copy_key = "lettings.soft_validations.net_income_value_check"
-    @person_index = person_index
-    @depends_on = depends_on
+    @depends_on = [{ "net_income_soft_validation_triggered?" => true }]
     @title_text = {
       "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text",
       "arguments" => [
@@ -32,23 +32,6 @@ class Form::Lettings::Pages::NetIncomeValueCheck < ::Form::Page
     }
   end
 
-  def depends_on
-    if @person_index.present?
-      [
-        {
-          "net_income_soft_validation_triggered?" => true,
-          "details_known_#{@person_index}" => 0,
-        },
-      ]
-    else
-      [
-        {
-          "net_income_soft_validation_triggered?" => true,
-        },
-      ]
-    end
-  end
-
   def questions
     @questions ||= [Form::Lettings::Questions::NetIncomeValueCheck.new(nil, nil, self)]
   end

app/models/form/lettings/subsections/household_characteristics.rb

@@ -13,7 +13,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       (Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_hhmemb_check", nil, self) if form.start_year_2026_or_later?),
-      Form::Lettings::Pages::NetIncomeValueCheck.new("hhmemb_net_income_value_check", nil, self),
       Form::Lettings::Pages::LeadTenantAge.new(nil, nil, self),
       (Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?),
@@ -38,7 +37,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::LeadTenantUnderRetirementValueCheck.new("working_situation_lead_tenant_under_retirement_value_check", nil, self),
       Form::Lettings::Pages::LeadTenantOverRetirementValueCheck.new("working_situation_lead_tenant_over_retirement_value_check", nil, self),
       (Form::Lettings::Pages::WorkingSituationIllnessCheckLead.new("working_situation_lead_tenant_long_term_illness_check", nil, self) if form.start_year_2026_or_later?),
-      Form::Lettings::Pages::NetIncomeValueCheck.new("working_situation_lead_tenant_net_income_value_check", nil, self),
       *person_questions(person_index: 2),
       *person_questions(person_index: 3),
       *person_questions(person_index: 4),
@@ -52,14 +50,10 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
   def person_questions(person_index:)
     [
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index:),
-
       (Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?),
-      (Form::Lettings::Pages::NetIncomeValueCheck.new("age_#{person_index}_net_income_value_check", nil, self, person_index:) if form.start_year_2026_or_later?),
-
       relationship_question(person_index:),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_#{person_index}_partner_under_16_value_check", nil, self, person_index:) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_#{person_index}_multiple_partners_value_check", nil, self, person_index:) unless form.start_year_2026_or_later?),
-
       (Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
@@ -67,8 +61,6 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonUnderRetirementValueCheck.new("age_#{person_index}_under_retirement_value_check", nil, self, person_index:),
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new("age_#{person_index}_over_retirement_value_check", nil, self, person_index:),
       (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("age_#{person_index}_partner_under_16_value_check", nil, self, person_index:) unless form.start_year_2026_or_later?),
-      (Form::Lettings::Pages::NetIncomeValueCheck.new("age_#{person_index}_net_income_value_check", nil, self, person_index:) unless form.start_year_2026_or_later?),
-
       (Form::Lettings::Pages::PersonSexRegisteredAtBirth.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?),
       (Form::Lettings::Pages::PersonGenderSameAsSex.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?),
       (Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
@@ -76,12 +68,10 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?),
       (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_person_#{person_index}_check", nil, self, person_index:) if form.start_year_2026_or_later?),
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new("gender_#{person_index}_over_retirement_value_check", nil, self, person_index:),
-
       Form::Lettings::Pages::PersonWorkingSituation.new(nil, nil, self, person_index:),
       Form::Lettings::Pages::PersonUnderRetirementValueCheck.new("working_situation_#{person_index}_under_retirement_value_check", nil, self, person_index:),
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new("working_situation_#{person_index}_over_retirement_value_check", nil, self, person_index:),
       (Form::Lettings::Pages::WorkingSituationIllnessCheckPerson.new("working_situation_#{person_index}_long_term_illness_check", nil, self, person_index:) if form.start_year_2026_or_later?),
-      Form::Lettings::Pages::NetIncomeValueCheck.new("working_situation_#{person_index}_net_income_value_check", nil, self, person_index:),
     ]
   end
 

app/models/form/lettings/subsections/income_and_benefits.rb

@@ -10,7 +10,7 @@ class Form::Lettings::Subsections::IncomeAndBenefits < ::Form::Subsection
     @pages ||= [
       Form::Lettings::Pages::IncomeKnown.new(nil, nil, self),
       Form::Lettings::Pages::IncomeAmount.new(nil, nil, self),
-      Form::Lettings::Pages::NetIncomeValueCheck.new("income_amount_net_income_value_check", nil, self),
+      Form::Lettings::Pages::NetIncomeValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::HousingBenefit.new("housing_benefit", nil, self),
       Form::Lettings::Pages::BenefitsProportion.new("benefits_proportion", nil, self),
       Form::Lettings::Pages::RentOrOtherCharges.new(nil, nil, self),

app/views/users/new.html.erb

@@ -54,7 +54,7 @@
             options: { disabled: [""], selected: @organisation_id ? answer_options.first : "" } %>
       <% end %>
 
-      <% hints_for_roles = { data_provider: ["Can view and submit logs for this organisation"], data_coordinator: ["Can view and submit logs for this organisation and any of its managing agents", "Can manage details for this organisation", "Can manage users for this organisation"], support: ["Can only be created for the MHCLG organisation in the CORE service, to be used by MHCLG and its contractor staff", "Has access to all organisations' data across the CORE service", "Cannot be created for users in housing organisations as this would be a data protection breach"] } %>
+      <% hints_for_roles = { data_provider: ["Can view and submit logs for this organisation"], data_coordinator: ["Can view and submit logs for this organisation and any of its managing agents", "Can manage details for this organisation", "Can manage users for this organisation"], support: nil } %>
 
       <% roles_with_hints = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: hints_for_roles[key.to_sym]) } %>
 

spec/models/form/lettings/pages/net_income_value_check_spec.rb

@@ -15,6 +15,10 @@ RSpec.describe Form::Lettings::Pages::NetIncomeValueCheck, type: :model do
     expect(page.questions.map(&:id)).to eq(%w[net_income_value_check])
   end
 
+  it "has the correct id" do
+    expect(page.id).to eq("net_income_value_check")
+  end
+
   it "has correct depends_on" do
     expect(page.depends_on).to eq([{ "net_income_soft_validation_triggered?" => true }])
   end

spec/models/form/lettings/subsections/household_characteristics_spec.rb

@@ -28,7 +28,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           household_members
           no_females_pregnant_household_lead_hhmemb_value_check
           females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check
-          hhmemb_net_income_value_check
           lead_tenant_age
           no_females_pregnant_household_lead_age_value_check
           females_in_soft_age_range_in_pregnant_household_lead_age_value_check
@@ -48,7 +47,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           lead_tenant_working_situation
           working_situation_lead_tenant_under_retirement_value_check
           working_situation_lead_tenant_over_retirement_value_check
-          working_situation_lead_tenant_net_income_value_check
           person_2_known
           person_2_relationship_to_lead
           relationship_2_partner_under_16_value_check
@@ -59,7 +57,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_2_under_retirement_value_check
           age_2_over_retirement_value_check
           age_2_partner_under_16_value_check
-          age_2_net_income_value_check
           person_2_gender_identity
           no_females_pregnant_household_person_2_value_check
           females_in_soft_age_range_in_pregnant_household_person_2_value_check
@@ -67,7 +64,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_2_working_situation
           working_situation_2_under_retirement_value_check
           working_situation_2_over_retirement_value_check
-          working_situation_2_net_income_value_check
           person_3_known
           person_3_relationship_to_lead
           relationship_3_partner_under_16_value_check
@@ -78,7 +74,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_3_under_retirement_value_check
           age_3_over_retirement_value_check
           age_3_partner_under_16_value_check
-          age_3_net_income_value_check
           person_3_gender_identity
           no_females_pregnant_household_person_3_value_check
           females_in_soft_age_range_in_pregnant_household_person_3_value_check
@@ -86,7 +81,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_3_working_situation
           working_situation_3_under_retirement_value_check
           working_situation_3_over_retirement_value_check
-          working_situation_3_net_income_value_check
           person_4_known
           person_4_relationship_to_lead
           relationship_4_partner_under_16_value_check
@@ -97,7 +91,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_4_under_retirement_value_check
           age_4_over_retirement_value_check
           age_4_partner_under_16_value_check
-          age_4_net_income_value_check
           person_4_gender_identity
           no_females_pregnant_household_person_4_value_check
           females_in_soft_age_range_in_pregnant_household_person_4_value_check
@@ -105,7 +98,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_4_working_situation
           working_situation_4_under_retirement_value_check
           working_situation_4_over_retirement_value_check
-          working_situation_4_net_income_value_check
           person_5_known
           person_5_relationship_to_lead
           relationship_5_partner_under_16_value_check
@@ -116,7 +108,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_5_under_retirement_value_check
           age_5_over_retirement_value_check
           age_5_partner_under_16_value_check
-          age_5_net_income_value_check
           person_5_gender_identity
           no_females_pregnant_household_person_5_value_check
           females_in_soft_age_range_in_pregnant_household_person_5_value_check
@@ -124,7 +115,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_5_working_situation
           working_situation_5_under_retirement_value_check
           working_situation_5_over_retirement_value_check
-          working_situation_5_net_income_value_check
           person_6_known
           person_6_relationship_to_lead
           relationship_6_partner_under_16_value_check
@@ -135,7 +125,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_6_under_retirement_value_check
           age_6_over_retirement_value_check
           age_6_partner_under_16_value_check
-          age_6_net_income_value_check
           person_6_gender_identity
           no_females_pregnant_household_person_6_value_check
           females_in_soft_age_range_in_pregnant_household_person_6_value_check
@@ -143,7 +132,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_6_working_situation
           working_situation_6_under_retirement_value_check
           working_situation_6_over_retirement_value_check
-          working_situation_6_net_income_value_check
           person_7_known
           person_7_relationship_to_lead
           relationship_7_partner_under_16_value_check
@@ -154,7 +142,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_7_under_retirement_value_check
           age_7_over_retirement_value_check
           age_7_partner_under_16_value_check
-          age_7_net_income_value_check
           person_7_gender_identity
           no_females_pregnant_household_person_7_value_check
           females_in_soft_age_range_in_pregnant_household_person_7_value_check
@@ -162,7 +149,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_7_working_situation
           working_situation_7_under_retirement_value_check
           working_situation_7_over_retirement_value_check
-          working_situation_7_net_income_value_check
           person_8_known
           person_8_relationship_to_lead
           relationship_8_partner_under_16_value_check
@@ -173,7 +159,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_8_under_retirement_value_check
           age_8_over_retirement_value_check
           age_8_partner_under_16_value_check
-          age_8_net_income_value_check
           person_8_gender_identity
           no_females_pregnant_household_person_8_value_check
           females_in_soft_age_range_in_pregnant_household_person_8_value_check
@@ -181,7 +166,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_8_working_situation
           working_situation_8_under_retirement_value_check
           working_situation_8_over_retirement_value_check
-          working_situation_8_net_income_value_check
         ],
       )
     end
@@ -198,7 +182,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           household_members
           no_females_pregnant_household_lead_hhmemb_value_check
           females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check
-          hhmemb_net_income_value_check
           lead_tenant_age
           no_females_pregnant_household_lead_age_value_check
           females_in_soft_age_range_in_pregnant_household_lead_age_value_check
@@ -218,7 +201,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           lead_tenant_working_situation
           working_situation_lead_tenant_under_retirement_value_check
           working_situation_lead_tenant_over_retirement_value_check
-          working_situation_lead_tenant_net_income_value_check
           person_2_known
           person_2_lead_partner
           relationship_2_partner_under_16_value_check
@@ -229,7 +211,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_2_under_retirement_value_check
           age_2_over_retirement_value_check
           age_2_partner_under_16_value_check
-          age_2_net_income_value_check
           person_2_gender_identity
           no_females_pregnant_household_person_2_value_check
           females_in_soft_age_range_in_pregnant_household_person_2_value_check
@@ -237,7 +218,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_2_working_situation
           working_situation_2_under_retirement_value_check
           working_situation_2_over_retirement_value_check
-          working_situation_2_net_income_value_check
           person_3_known
           person_3_lead_partner
           relationship_3_partner_under_16_value_check
@@ -248,7 +228,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_3_under_retirement_value_check
           age_3_over_retirement_value_check
           age_3_partner_under_16_value_check
-          age_3_net_income_value_check
           person_3_gender_identity
           no_females_pregnant_household_person_3_value_check
           females_in_soft_age_range_in_pregnant_household_person_3_value_check
@@ -256,7 +235,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_3_working_situation
           working_situation_3_under_retirement_value_check
           working_situation_3_over_retirement_value_check
-          working_situation_3_net_income_value_check
           person_4_known
           person_4_lead_partner
           relationship_4_partner_under_16_value_check
@@ -267,7 +245,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_4_under_retirement_value_check
           age_4_over_retirement_value_check
           age_4_partner_under_16_value_check
-          age_4_net_income_value_check
           person_4_gender_identity
           no_females_pregnant_household_person_4_value_check
           females_in_soft_age_range_in_pregnant_household_person_4_value_check
@@ -275,7 +252,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_4_working_situation
           working_situation_4_under_retirement_value_check
           working_situation_4_over_retirement_value_check
-          working_situation_4_net_income_value_check
           person_5_known
           person_5_lead_partner
           relationship_5_partner_under_16_value_check
@@ -286,7 +262,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_5_under_retirement_value_check
           age_5_over_retirement_value_check
           age_5_partner_under_16_value_check
-          age_5_net_income_value_check
           person_5_gender_identity
           no_females_pregnant_household_person_5_value_check
           females_in_soft_age_range_in_pregnant_household_person_5_value_check
@@ -294,7 +269,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_5_working_situation
           working_situation_5_under_retirement_value_check
           working_situation_5_over_retirement_value_check
-          working_situation_5_net_income_value_check
           person_6_known
           person_6_lead_partner
           relationship_6_partner_under_16_value_check
@@ -305,7 +279,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_6_under_retirement_value_check
           age_6_over_retirement_value_check
           age_6_partner_under_16_value_check
-          age_6_net_income_value_check
           person_6_gender_identity
           no_females_pregnant_household_person_6_value_check
           females_in_soft_age_range_in_pregnant_household_person_6_value_check
@@ -313,7 +286,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_6_working_situation
           working_situation_6_under_retirement_value_check
           working_situation_6_over_retirement_value_check
-          working_situation_6_net_income_value_check
           person_7_known
           person_7_lead_partner
           relationship_7_partner_under_16_value_check
@@ -324,7 +296,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_7_under_retirement_value_check
           age_7_over_retirement_value_check
           age_7_partner_under_16_value_check
-          age_7_net_income_value_check
           person_7_gender_identity
           no_females_pregnant_household_person_7_value_check
           females_in_soft_age_range_in_pregnant_household_person_7_value_check
@@ -332,7 +303,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_7_working_situation
           working_situation_7_under_retirement_value_check
           working_situation_7_over_retirement_value_check
-          working_situation_7_net_income_value_check
           person_8_known
           person_8_lead_partner
           relationship_8_partner_under_16_value_check
@@ -343,7 +313,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           age_8_under_retirement_value_check
           age_8_over_retirement_value_check
           age_8_partner_under_16_value_check
-          age_8_net_income_value_check
           person_8_gender_identity
           no_females_pregnant_household_person_8_value_check
           females_in_soft_age_range_in_pregnant_household_person_8_value_check
@@ -351,7 +320,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           person_8_working_situation
           working_situation_8_under_retirement_value_check
           working_situation_8_over_retirement_value_check
-          working_situation_8_net_income_value_check
         ],
       )
     end
@@ -367,7 +335,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
         %w[
           household_members
           no_household_member_likely_to_be_pregnant_hhmemb_check
-          hhmemb_net_income_value_check
           lead_tenant_age
           no_household_member_likely_to_be_pregnant_lead_age_check
           age_lead_tenant_under_retirement_value_check
@@ -387,10 +354,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_lead_tenant_under_retirement_value_check
           working_situation_lead_tenant_over_retirement_value_check
           working_situation_lead_tenant_long_term_illness_check
-          working_situation_lead_tenant_net_income_value_check
           person_2_known
           person_2_age
-          age_2_net_income_value_check
           person_2_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_2_check
           age_2_under_retirement_value_check
@@ -403,10 +368,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_2_under_retirement_value_check
           working_situation_2_over_retirement_value_check
           working_situation_2_long_term_illness_check
-          working_situation_2_net_income_value_check
           person_3_known
           person_3_age
-          age_3_net_income_value_check
           person_3_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_3_check
           age_3_under_retirement_value_check
@@ -419,10 +382,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_3_under_retirement_value_check
           working_situation_3_over_retirement_value_check
           working_situation_3_long_term_illness_check
-          working_situation_3_net_income_value_check
           person_4_known
           person_4_age
-          age_4_net_income_value_check
           person_4_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_4_check
           age_4_under_retirement_value_check
@@ -435,10 +396,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_4_under_retirement_value_check
           working_situation_4_over_retirement_value_check
           working_situation_4_long_term_illness_check
-          working_situation_4_net_income_value_check
           person_5_known
           person_5_age
-          age_5_net_income_value_check
           person_5_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_5_check
           age_5_under_retirement_value_check
@@ -451,10 +410,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_5_under_retirement_value_check
           working_situation_5_over_retirement_value_check
           working_situation_5_long_term_illness_check
-          working_situation_5_net_income_value_check
           person_6_known
           person_6_age
-          age_6_net_income_value_check
           person_6_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_6_check
           age_6_under_retirement_value_check
@@ -467,10 +424,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_6_under_retirement_value_check
           working_situation_6_over_retirement_value_check
           working_situation_6_long_term_illness_check
-          working_situation_6_net_income_value_check
           person_7_known
           person_7_age
-          age_7_net_income_value_check
           person_7_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_7_check
           age_7_under_retirement_value_check
@@ -483,10 +438,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_7_under_retirement_value_check
           working_situation_7_over_retirement_value_check
           working_situation_7_long_term_illness_check
-          working_situation_7_net_income_value_check
           person_8_known
           person_8_age
-          age_8_net_income_value_check
           person_8_lead_partner
           no_household_member_likely_to_be_pregnant_person_age_8_check
           age_8_under_retirement_value_check
@@ -499,7 +452,6 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
           working_situation_8_under_retirement_value_check
           working_situation_8_over_retirement_value_check
           working_situation_8_long_term_illness_check
-          working_situation_8_net_income_value_check
         ],
       )
     end

spec/models/form/lettings/subsections/income_and_benefits_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Form::Lettings::Subsections::IncomeAndBenefits, type: :model do
         %w[
           income_known
           income_amount
-          income_amount_net_income_value_check
+          net_income_value_check
           housing_benefit
           benefits_proportion
           rent_or_other_charges
@@ -58,7 +58,7 @@ RSpec.describe Form::Lettings::Subsections::IncomeAndBenefits, type: :model do
         %w[
           income_known
           income_amount
-          income_amount_net_income_value_check
+          net_income_value_check
           housing_benefit
           benefits_proportion
           rent_or_other_charges