Merge remote-tracking branch 'origin/hw-footer' into hw-footer-medium

trussworks · May 5, 2020 · 6809831 · 6809831
2 parents 3e6dd78 + 4907181
commit 6809831
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx
@@ -39,7 +39,7 @@ export const Footer = ({
   )
 
   return (
-    <footer className={classes}>
+    <footer {...footerAttributes} className={classes}>
       {returnToTop && returnToTop}
       <div className="usa-footer__primary-section">{primary}</div>
 

diff --git a/src/components/Footer/Logo/Logo.tsx b/src/components/Footer/Logo/Logo.tsx
@@ -25,21 +25,18 @@ export const Logo = ({
     },
     elementAttributes.className
   )
+
   const columnClasses = classnames({
     'mobile-lg:grid-col-auto': big || medium,
     'grid-col-auto': slim,
   })
 
   return (
     <div className={containerClasses} data-testid="footerLogo">
-      {heading ? (
-        <>
-          <div className={columnClasses}>{image}</div>
-          <div className={columnClasses}>{heading}</div>
-        </>
-      ) : (
-        <>{image}</>
-      )}
+      <>
+        <div className={columnClasses}>{image}</div>
+        {heading && <div className={columnClasses}>{heading}</div>}
+      </>
     </div>
   )
 }