From 885bd9106267e9bf8ec21c0b349d78a0da113998 Mon Sep 17 00:00:00 2001 From: Aaron Spencer Date: Wed, 21 Jun 2023 22:23:31 +0100 Subject: [PATCH] CLDC-2439: Informative removed, check pages fixed. --- app/models/form/lettings/pages/max_rent_value_check.rb | 10 ---------- app/models/form/lettings/pages/min_rent_value_check.rb | 8 -------- .../form/lettings/questions/max_rent_value_check.rb | 6 +++--- .../form/lettings/questions/min_rent_value_check.rb | 6 +++--- config/locales/en.yml | 2 -- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/app/models/form/lettings/pages/max_rent_value_check.rb b/app/models/form/lettings/pages/max_rent_value_check.rb index b0d220e8f..6686e448b 100644 --- a/app/models/form/lettings/pages/max_rent_value_check.rb +++ b/app/models/form/lettings/pages/max_rent_value_check.rb @@ -12,16 +12,6 @@ class Form::Lettings::Pages::MaxRentValueCheck < ::Form::Page }, ], } - @informative_text = { - "translation" => "soft_validations.rent.max_hint_text", - "arguments" => [ - { - "key" => "field_formatted_as_currency", - "arguments_for_key" => "soft_max_for_period", - "i18n_template" => "soft_max_for_period", - }, - ], - } @check_answers_card_number = check_answers_card_number end diff --git a/app/models/form/lettings/pages/min_rent_value_check.rb b/app/models/form/lettings/pages/min_rent_value_check.rb index 3709def7f..c8ab1153e 100644 --- a/app/models/form/lettings/pages/min_rent_value_check.rb +++ b/app/models/form/lettings/pages/min_rent_value_check.rb @@ -10,14 +10,6 @@ class Form::Lettings::Pages::MinRentValueCheck < ::Form::Page "i18n_template" => "brent", }], } - @informative_text = { - "translation" => "soft_validations.rent.min_hint_text", - "arguments" => [{ - "key" => "field_formatted_as_currency", - "arguments_for_key" => "soft_min_for_period", - "i18n_template" => "soft_min_for_period", - }], - } @check_answers_card_number = check_answers_card_number end diff --git a/app/models/form/lettings/questions/max_rent_value_check.rb b/app/models/form/lettings/questions/max_rent_value_check.rb index 4eeb4c23a..3dc3a41a4 100644 --- a/app/models/form/lettings/questions/max_rent_value_check.rb +++ b/app/models/form/lettings/questions/max_rent_value_check.rb @@ -1,14 +1,14 @@ class Form::Lettings::Questions::MaxRentValueCheck < ::Form::Question def initialize(id, hsh, page, check_answers_card_number:) super(id, hsh, page) - @id = "max_rent_value_check" + @id = "rent_value_check" @check_answer_label = "Total rent confirmation" @header = "Are you sure this is correct?" @type = "interruption_screen" - @hint_text = hint_text + @hint_text = hint_text @check_answers_card_number = check_answers_card_number @answer_options = ANSWER_OPTIONS - @hidden_in_check_answers = { "depends_on" => [{ "max_rent_value_check" => 0 }, { "max_rent_value_check" => 1 }] } + @hidden_in_check_answers = { "depends_on" => [{ "rent_value_check" => 0 }, { "rent_value_check" => 1 }] } end ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze diff --git a/app/models/form/lettings/questions/min_rent_value_check.rb b/app/models/form/lettings/questions/min_rent_value_check.rb index ba87a82a2..74c1ca0dd 100644 --- a/app/models/form/lettings/questions/min_rent_value_check.rb +++ b/app/models/form/lettings/questions/min_rent_value_check.rb @@ -1,14 +1,14 @@ class Form::Lettings::Questions::MinRentValueCheck < ::Form::Question def initialize(id, hsh, page, check_answers_card_number:) super(id, hsh, page) - @id = "min_rent_value_check" + @id = "rent_value_check" @check_answer_label = "Total rent confirmation" @header = "Are you sure this is correct?" @type = "interruption_screen" - @hint_text = hint_text + @hint_text = hint_text @check_answers_card_number = check_answers_card_number @answer_options = ANSWER_OPTIONS - @hidden_in_check_answers = { "depends_on" => [{ "min_rent_value_check" => 0 }, { "min_rent_value_check" => 1 }] } + @hidden_in_check_answers = { "depends_on" => [{ "rent_value_check" => 0 }, { "rent_value_check" => 1 }] } end ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze diff --git a/config/locales/en.yml b/config/locales/en.yml index 73cf91d0a..2fcd02046 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -595,8 +595,6 @@ en: over_soft_max_for_la_combined: "You told us the combined income of this household is %{combined_income}. This seems high. Are you sure this is correct?" rent: outside_range_title: "You told us the rent is %{brent}" - min_hint_text: "The minimum rent expected for this type of property in this local authority is %{soft_min_for_period}." - max_hint_text: "The maximum rent expected for this type of property in this local authority is %{soft_max_for_period}." purchase_price: title_text: "You told us the purchase price is %{value}" hint_text: "This is %{higher_or_lower} than we would expect"