From 2af9d6dcd3ae8b3d881ba35b2c8839c6a365c255 Mon Sep 17 00:00:00 2001
From: TomNUSDS <74203452+TomNUSDS@users.noreply.github.com>
Date: Mon, 16 Aug 2021 09:08:54 -0700
Subject: [PATCH] fix contact fix footer (#511)

* Fix footer
* Remove one contact
* Fix some spacing issues
* Update J40Footer.spec.tsx.snap
* Fixes suggested in code review
---
 client/src/components/J40Footer.tsx           |  4 +-
 .../__snapshots__/J40Footer.spec.tsx.snap     |  4 +-
 client/src/pages/contact.tsx                  | 59 +++++++------------
 3 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/client/src/components/J40Footer.tsx b/client/src/components/J40Footer.tsx
index 7cfa2e67..427ef78e 100644
--- a/client/src/components/J40Footer.tsx
+++ b/client/src/components/J40Footer.tsx
@@ -28,7 +28,7 @@ const J40Footer = () => {
     },
     moreinfoheader: {
       id: 'footer.moreinfoheader',
-      defaultMessage: 'More Information',
+      defaultMessage: 'More information',
       description: 'Footer column header',
     },
     foia: {
@@ -70,7 +70,7 @@ const J40Footer = () => {
               aria-label={intl.formatMessage(messages.arialabelfooter)}
               size="big" // fyi you leave this off and it silently fails...
               links={[
-                ['Contacts',
+                ['Contact',
                   <Address
                     key={'footeraddress'}
                     className={'j40-footer-address'}
diff --git a/client/src/components/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/__snapshots__/J40Footer.spec.tsx.snap
index ee96fcd9..5b74762e 100644
--- a/client/src/components/__snapshots__/J40Footer.spec.tsx.snap
+++ b/client/src/components/__snapshots__/J40Footer.spec.tsx.snap
@@ -32,7 +32,7 @@ exports[`J40Footer renders correctly 1`] = `
                   <h4
                     class="usa-footer__primary-link"
                   >
-                    Contacts
+                    Contact
                   </h4>
                   <ul
                     class="usa-list usa-list--unstyled"
@@ -76,7 +76,7 @@ exports[`J40Footer renders correctly 1`] = `
                   <h4
                     class="usa-footer__primary-link"
                   >
-                    More Information
+                    More information
                   </h4>
                   <ul
                     class="usa-list usa-list--unstyled"
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx
index abaed7af..7ba87e0d 100644
--- a/client/src/pages/contact.tsx
+++ b/client/src/pages/contact.tsx
@@ -11,53 +11,36 @@ interface ContactPageProps {
 }
 
 const ContactPage = ({location}: ContactPageProps) => {
-  const generalemail = 'screeningtool.feedback@usds.gov';
-  const techemail = 'screeningtool.support@usds.gov';
+  const generalEmail = 'screeningtool.feedback@usds.gov';
 
   return (
     <Layout location={location}>
 
       <J40MainGridContainer fullWidth={true}>
-        <AlertWrapper />
+        <AlertWrapper/>
       </J40MainGridContainer>
 
-      <J40MainGridContainer>
+      <J40MainGridContainer className={'usa-prose'}>
         <Grid row><Grid col>
-          <section className={'usa-prose'}>
-            <h2><FormattedMessage
-              id={'contact.pageheader'}
-              description={'H2 header for contact page'}
-              defaultMessage={'Contact'}/></h2>
-            <h3><FormattedMessage
-              id={'contact.sectionheader'}
-              description={'Heading for page to allow users to contact project maintainers'}
-              defaultMessage={'Email us'}/></h3>
+          <h2><FormattedMessage
+            id={'contact.pageheader'}
+            description={'H2 header for contact page'}
+            defaultMessage={'Contact'}/></h2>
+          <h3><FormattedMessage
+            id={'contact.sectionheader'}
+            description={'Heading for page to allow users to contact project maintainers'}
+            defaultMessage={'Email us'}/></h3>
 
-            <p>
-              <FormattedMessage
-                id={'contact.general'}
-                description={'Contact page body text'}
-                defaultMessage={`
-              For general feedback, email {general_email_address}
-          `}
-                values={{
-                  general_email_address:
-                    <a href={`mailto:${generalemail}`}>{generalemail}</a>,
-                }}/>
-            </p>
-            <p>
-              <FormattedMessage
-                id={'contact.general'}
-                description={'Contact page body text'}
-                defaultMessage={`
-              For technical support, email {tech_email_address}
-          `}
-                values={{
-                  tech_email_address:
-                    <a href={`mailto:${techemail}`}>{techemail}</a>,
-                }}/>
-            </p>
-          </section>
+          <p>
+            <FormattedMessage
+              id={'contact.general'}
+              description={'Contact page body text'}
+              defaultMessage={`For general feedback, email {general_email_address}`}
+              values={{
+                general_email_address:
+                    <a href={`mailto:${generalEmail}`}>{generalEmail}</a>,
+              }}/>
+          </p>
         </Grid></Grid>
       </J40MainGridContainer>
     </Layout>