Use id argument and pass in full IDs

app/models/form/page.rb

@@ -2,7 +2,7 @@ class Form::Page
   attr_accessor :id, :header, :header_partial, :description, :questions, :depends_on, :title_text,
                 :informative_text, :subsection, :hide_subsection_label, :next_unresolved_page_id
 
-  def initialize(id, hsh, subsection, _dynamic_values = {})
+  def initialize(id, hsh, subsection)
     @id = id
     @subsection = subsection
     if hsh

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

@@ -1,7 +1,6 @@
 class Form::Sales::Pages::Buyer1IncomeValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, dynamic_values = {})
+  def initialize(id, hsh, subsection)
     super
-    @id = "#{dynamic_values.present? ? dynamic_values[:id_prefix] : ''}buyer_1_income_value_check"
     @header = ""
     @description = ""
     @subsection = subsection

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

@@ -1,7 +1,6 @@
 class Form::Sales::Pages::MortgageValueCheck < ::Form::Page
-  def initialize(id, hsh, subsection, dynamic_values)
+  def initialize(id, hsh, subsection)
     super
-    @id = "#{dynamic_values.present? ? dynamic_values[:id_prefix] : ''}mortgage_value_check"
     @header = ""
     @description = ""
     @subsection = subsection

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

@@ -21,7 +21,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
       Form::Sales::Pages::Nationality1.new(nil, nil, self),
       Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self),
-      Form::Sales::Pages::Buyer1IncomeValueCheck.new(nil, nil, self, { id_prefix: "working_situation_" }),
+      Form::Sales::Pages::Buyer1IncomeValueCheck.new("working_situation_buyer_1_income_value_check", nil, self),
       Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
       Form::Sales::Pages::Age2.new(nil, nil, self),

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

@@ -10,12 +10,12 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
   def pages
     @pages ||= [
       Form::Sales::Pages::Buyer1Income.new(nil, nil, self),
-      Form::Sales::Pages::Buyer1IncomeValueCheck.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1IncomeValueCheck.new("buyer_1_income_value_check", nil, self),
-      Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_1_income_" }),
+      Form::Sales::Pages::MortgageValueCheck.new("buyer_1_income_mortgage_value_check", nil, self),
       Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self),
-      Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_1_" }),
+      Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self),
       Form::Sales::Pages::Buyer2Income.new(nil, nil, self),
-      Form::Sales::Pages::MortgageValueCheck.new(nil, nil, self, { id_prefix: "buyer_2_income_" }),
+      Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self),
       Form::Sales::Pages::Savings.new(nil, nil, self),
       Form::Sales::Pages::PreviousOwnership.new(nil, nil, self),
     ]

spec/models/form/sales/pages/buyer1_income_value_check_spec.rb

@@ -1,9 +1,9 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Pages::Buyer1IncomeValueCheck, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection, { id_prefix: "prefix_" }) }
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
-  let(:page_id) { nil }
+  let(:page_id) { "prefix_buyer_1_income_value_check" }
   let(:page_definition) { nil }
   let(:subsection) { instance_double(Form::Subsection) }
 

spec/models/form/sales/pages/mortgage_value_check_spec.rb

@@ -1,9 +1,9 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do
-  subject(:page) { described_class.new(page_id, page_definition, subsection, { id_prefix: "buyer_1_income_" }) }
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
-  let(:page_id) { nil }
+  let(:page_id) { "buyer_1_income_mortgage_value_check" }
   let(:page_definition) { nil }
   let(:subsection) { instance_double(Form::Subsection) }