From 32212887c145573e87d6341b9fe5bc3ea6157366 Mon Sep 17 00:00:00 2001
From: Nathan James <nathan.james@mediacurrent.com>
Date: Tue, 15 May 2018 14:19:46 -0500
Subject: [PATCH 1/4] Contact us: Show more style with only 2 items

---
 changelogs/DP-8956.txt                        |  4 +++
 .../_patterns/02-molecules/contact-us.md      |  6 ++++
 .../_patterns/02-molecules/contact-us.twig    | 34 ++++++++++---------
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 changelogs/DP-8956.txt

diff --git a/changelogs/DP-8956.txt b/changelogs/DP-8956.txt
new file mode 100644
index 0000000000..3feef02ccd
--- /dev/null
+++ b/changelogs/DP-8956.txt
@@ -0,0 +1,4 @@
+___DESCRIPTION___
+Fixed
+Patch
+- DP-8956: Update contact us to provide a way to keep address above other information even if there is only two contact groups.
diff --git a/styleguide/source/_patterns/02-molecules/contact-us.md b/styleguide/source/_patterns/02-molecules/contact-us.md
index 699411b45f..7c7137aef2 100644
--- a/styleguide/source/_patterns/02-molecules/contact-us.md
+++ b/styleguide/source/_patterns/02-molecules/contact-us.md
@@ -31,6 +31,12 @@ contactUs: {
   subTitle: {
     type: columnHeading / optional
   }
+  showMore: {
+    type: boolean / optional
+  }
+  hideSecondary: {
+    type: boolean / optional
+  }
   level:
     type: number / optional
   contactName:
diff --git a/styleguide/source/_patterns/02-molecules/contact-us.twig b/styleguide/source/_patterns/02-molecules/contact-us.twig
index 65c10cd8aa..10e399ad49 100644
--- a/styleguide/source/_patterns/02-molecules/contact-us.twig
+++ b/styleguide/source/_patterns/02-molecules/contact-us.twig
@@ -40,22 +40,24 @@
         {% endfor %}
       {% endblock %}
 
-      {# Show 3rd+ contact groups inside of accordion (if they exist) #}
-      <div class="ma__contact-us__extra js-accordion-content">
-        {% block secondaryContactGroups %}
-          {% for group in contactUs.groups[2:last] %}
-            {% set contactGroup = group|merge({
-                               "level": groupHeading,
-                               "contactName": contactName })  %}
-            {% include "@molecules/contact-group.twig" %}
-          {% endfor %}
-        {% endblock %}
-      </div>
-      <div class="ma__contact-us__expand">
-        <button type="button" class="js-accordion-link">
-          <span>more</span><span>less</span> contact info
-        </button>
-      </div>
+      {% if not contactUs.hideSecondary %}
+        {# Show 3rd+ contact groups inside of accordion (if they exist) #}
+        <div class="ma__contact-us__extra js-accordion-content">
+          {% block secondaryContactGroups %}
+            {% for group in contactUs.groups[2:last] %}
+              {% set contactGroup = group|merge({
+                                 "level": groupHeading,
+                                 "contactName": contactName })  %}
+              {% include "@molecules/contact-group.twig" %}
+            {% endfor %}
+          {% endblock %}
+        </div>
+        <div class="ma__contact-us__expand">
+          <button type="button" class="js-accordion-link">
+            <span>more</span><span>less</span> contact info
+          </button>
+        </div>
+      {% endif %}
     {% else %}
       <div class="ma__contact-us__content js-accordion-content">
         <div class="ma__contact-us__content-wrap">

From e3764ecc7e6ca71ab5469a66599ae1d3b645cd02 Mon Sep 17 00:00:00 2001
From: Melissa Rossi <mrossi113@gmail.com>
Date: Wed, 16 May 2018 12:09:06 -0400
Subject: [PATCH 2/4] Added release notes for 5.24.0

---
 release-notes.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/release-notes.md b/release-notes.md
index 007d44fa82..b70b460ea8 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -13,6 +13,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 **For example**
 - DP-1234: The short description text on a [service detail](http://mayflower.digital.mass.gov/?p=pages-detail-for-service-howto-location) page banner ([@organisms/by-template/page-banner](http://mayflower.digital.mass.gov/?p=organisms-page-banner)) should now render ([PR #493](https://github.com/massgov/mayflower/pull/493))
 
+## 5.24.0 (5/16/2018)
+
+### Fixed
+- DP-8956: Update contact us to provide a way to keep address above other information even if there is only two contact groups.
+
 ## 5.23.0 (5/15/2018)
 
 ### Added

From 5635d62b8d6398af42d12014e8a92020f6201430 Mon Sep 17 00:00:00 2001
From: Melissa Rossi <mrossi113@gmail.com>
Date: Wed, 16 May 2018 12:09:46 -0400
Subject: [PATCH 3/4] Removed changelog txt file for 5.24.0

---
 changelogs/DP-8956.txt | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 changelogs/DP-8956.txt

diff --git a/changelogs/DP-8956.txt b/changelogs/DP-8956.txt
deleted file mode 100644
index 3feef02ccd..0000000000
--- a/changelogs/DP-8956.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-___DESCRIPTION___
-Fixed
-Patch
-- DP-8956: Update contact us to provide a way to keep address above other information even if there is only two contact groups.

From defb31cd87d2b5811616c7e6910c578ae3689873 Mon Sep 17 00:00:00 2001
From: Melissa Rossi <mrossi113@gmail.com>
Date: Wed, 16 May 2018 12:10:44 -0400
Subject: [PATCH 4/4] Updated the package.json version to 5.24.0

---
 styleguide/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styleguide/package.json b/styleguide/package.json
index 9369d8e296..0a99162553 100644
--- a/styleguide/package.json
+++ b/styleguide/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@massds/mayflower",
   "description": "Open source UI components and visual style guide for Massachusetts government websites",
-  "version": "5.23.0",
+  "version": "5.24.0",
   "author": "Massachusetts Digital Services (MDS)",
   "repository": {
     "type": "git",