fix rebase conflicts

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

@@ -0,0 +1,17 @@
+class Form::Sales::Pages::DepositAndMortgageValueCheck < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @depends_on = [
+      {
+        "mortgage_plus_deposit_less_than_discounted_value?" => true,
+      },
+    ]
+    @informative_text = {}
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::DepositAndMortgageValueCheck.new(nil, nil, self),
+    ]
+  end
+end

app/models/form/sales/questions/deposit_and_mortgage_value_check.rb

@@ -0,0 +1,23 @@
+class Form::Sales::Questions::DepositAndMortgageValueCheck < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "deposit_and_mortgage_value_check"
+    @check_answer_label = "Deposit and mortgage against discount confirmation" # is this meant to come from somewhere or do I just write something sensible?
+    @header = "Are you sure? Mortgage and deposit usually equal or are more than (value - discount)"
+    @type = "interruption_screen"
+    @answer_options = {
+      "0" => { "value" => "Yes" },
+      "1" => { "value" => "No" },
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "deposit_and_mortgage_value_check" => 0,
+        },
+        {
+          "deposit_and_mortgage_value_check" => 1,
+        },
+      ],
+    }
+  end
+end

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

@@ -25,6 +25,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_discounted_ownership", nil, self),
       Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_deposit_value_check", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("discounted_ownership_deposit_value_check", nil, self),
+      Form::Sales::Pages::DepositAndMortgageValueCheck.new("discounted_ownership_deposit_and_mortgage_value_check", nil, self),
       Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_discounted_ownership", nil, self),
     ]
   end

app/models/validations/sales/soft_validations.rb

@@ -53,6 +53,13 @@ module Validations::Sales::SoftValidations
     mortgage_value + deposit + cash_discount != value * equity / 100
   end
 
+  def mortgage_plus_deposit_less_than_discounted_value?
+    return unless mortgage && deposit && value && discount
+
+    discounted_value = value * (100 - discount) / 100
+    mortgage + deposit < discounted_value
+  end
+
   def hodate_3_years_or_more_saledate?
     return unless hodate && saledate
 

spec/models/validations/sales/soft_validations_spec.rb

@@ -201,6 +201,59 @@ RSpec.describe Validations::Sales::SoftValidations do
       end
     end
 
+    context "when validating mortgage and deposit against discounted value" do
+      [
+        {
+          nil_field: "mortgage",
+          value: 500_000,
+          deposit: 10_000,
+          discount: 10,
+        },
+        {
+          nil_field: "value",
+          mortgage: 100_000,
+          deposit: 10_000,
+          discount: 10,
+        },
+        {
+          nil_field: "deposit",
+          value: 500_000,
+          mortgage: 100_000,
+          discount: 10,
+        },
+        {
+          nil_field: "discount",
+          value: 500_000,
+          mortgage: 100_000,
+          deposit: 10_000,
+        },
+      ].each do |test_case|
+        it "returns false if #{test_case[:nil_field]} is not present" do
+          record.value = test_case[:value]
+          record.mortgage = test_case[:mortgage]
+          record.deposit = test_case[:deposit]
+          record.discount = test_case[:discount]
+          expect(record).not_to be_mortgage_plus_deposit_less_than_discounted_value
+        end
+      end
+
+      it "returns false if the deposit and mortgage add up to the discounted value or more" do
+        record.value = 500_000
+        record.discount = 20
+        record.mortgage = 200_000
+        record.deposit = 200_000
+        expect(record).not_to be_mortgage_plus_deposit_less_than_discounted_value
+      end
+
+      it "returns true if the deposit and mortgage add up to less than the discounted value" do
+        record.value = 500_000
+        record.discount = 10
+        record.mortgage = 200_000
+        record.deposit = 200_000
+        expect(record).to be_mortgage_plus_deposit_less_than_discounted_value
+      end
+    end
+
     context "when validating extra borrowing" do
       it "returns false if extrabor not present" do
         record.mortgage = 50_000