From 1242c14c6c0e0bc40962340ff320e4f2b7293791 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Tue, 26 Apr 2022 15:03:18 +0100
Subject: [PATCH] Move link to privacy notice to declaration question

---
 app/views/form/guidance/_privacy_notice.erb |  1 +
 config/forms/2021_2022.json                 | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 app/views/form/guidance/_privacy_notice.erb

diff --git a/app/views/form/guidance/_privacy_notice.erb b/app/views/form/guidance/_privacy_notice.erb
new file mode 100644
index 000000000..c6e0b9adc
--- /dev/null
+++ b/app/views/form/guidance/_privacy_notice.erb
@@ -0,0 +1 @@
+<p class="govuk-body">Make sure the tenant has seen <%= govuk_link_to "the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice", privacy_notice_path %> before completing this log.</p>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 6ad183e49..211c29433 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1114,7 +1114,6 @@
     },
     "household": {
       "label": "About the household",
-      "description": "Make sure the tenant has seen <a class=\"govuk-link\" href=\"/privacy-notice\">the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice</a> before completing this section.",
       "subsections": {
         "household_characteristics": {
           "label": "Household characteristics",
@@ -1125,16 +1124,18 @@
           ],
           "pages": {
             "declaration": {
-              "header": "",
+              "header": "Department for Levelling Up, Housing & Communities privacy notice",
               "description": "",
               "questions": {
                 "declaration": {
+                  "header": "",
+                  "guidance_partial": "privacy_notice",
                   "check_answer_label": "Tenant has seen the privacy notice",
-                  "header": "Department for Levelling Up, Housing & Communities privacy notice ",
-                  "hint_text": "Make sure the tenant has seen the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice before submitting this log",
                   "type": "checkbox",
                   "answer_options": {
-                    "declaration": "The tenant has seen the Department for Levelling Up, Housing & Communities (DLUHC) privacy notice"
+                    "declaration": {
+                      "value": "The tenant has seen the DLUHC privacy notice"
+                    }
                   }
                 }
               }