From 9b692610de3786eb9ea501b18f7f0e7d78285473 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Thu, 5 Nov 2020 09:36:47 -0800
Subject: [PATCH] DIV-1158 - UX issue when asking for names ("Your spouse" /
 "Your information" screens)

---
 edivorce/apps/core/templates/question/02_claimant.html   | 7 +++++--
 edivorce/apps/core/templates/question/03_respondent.html | 9 +++++----
 edivorce/fixtures/Question.json                          | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index 905196f3..09e0deaf 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -39,7 +39,10 @@
     </div>
     <div class="collapse" id="collapse_changed_name">
         <div>
-            <p>If either of you has had a legal name change since you were married, put that new name on your form, and bring along a copy of the change of name certificate when you file your documents.</p>
+            <p>
+                The name written here must match the name that is on your marriage certificate. If you have changed your 
+                legal name since you were married, add it to the section below titled &ldquo;Do you go by any other names&rdquo;.
+            </p>
         </div>
     </div>
 
@@ -57,7 +60,7 @@
 </div>
 
 <div class="question-well {% if any_other_name_you_error %}error{% endif %}">
-    <h3>Do you go by any other names?{% if any_other_name_you_error %}{% include 'partials/required.html' %}{% endif %}</h3>
+    <h3>Do you go by any other names?{% include "partials/optional.html" %}</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index 276d3f07..fc4fc05c 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -43,9 +43,10 @@
     </div>
     <div class="collapse" id="collapse_legal_name">
         <div>
-            <p>If either of you has had a legal name change since you were married, put that new name on
-                your form,
-                and bring along a copy of the change of name certificate when you file your documents.</p>
+            <p>
+                The name written here must match your spouses's name that is on your marriage certificate. If they have changed 
+                their legal name since you were married, add it to the section below titled &ldquo;Does your spouse go by any other names&rdquo;.
+            </p>
         </div>
     </div>
 
@@ -64,7 +65,7 @@
 </div>
 
 <div class="question-well {% if any_other_name_spouse_error %}error{% endif %}">
-    <h3>Does your spouse go by any other names?{% if any_other_name_spouse_error %}{% include 'partials/required.html' %}{% endif %}</h3>
+    <h3>Does your spouse go by any other names?{% include "partials/optional.html" %}</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index af32830d..618981e8 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -242,7 +242,7 @@
         "name": "Do you go by any other names?",
         "description": "For step 2, Form 1 Claimant 1, Form 35 Claimant 1, Form 36 Claimant 1, Form 38 Claimant 1(sole), Form 38 Claimant 1, affidavit section(joint), Form 52 Claimant 1",
         "summary_order": 23,
-        "required": "Required"
+        "required": ""
     },
     "model": "core.question",
     "pk": "any_other_name_you"
@@ -366,7 +366,7 @@
         "name": "Does your spouse go by any other names?",
         "description": "For step 3, Form 1 Claimant 2, Form 35 Claimant 2, Form 36 Claimant 2, Form 38 Claimant 2(sole), Form 38 Claimant 2, affidavit section(joint), Form 52 Claimant 2",
         "summary_order": 35,
-        "required": "Required"
+        "required": ""
     },
     "model": "core.question",
     "pk": "any_other_name_spouse"