From 79d50e9cb4698d373862dc0af3af249caef88b04 Mon Sep 17 00:00:00 2001
From: Vim USDS <vimal.k.shah@omb.eop.gov>
Date: Wed, 17 Aug 2022 16:59:11 -0700
Subject: [PATCH] Show Tract info/demo only when tracts are selected

---
 .../src/components/AreaDetail/AreaDetail.tsx  |  55 ++--------
 .../__snapshots__/areaDetail.test.tsx.snap    | 102 ------------------
 client/src/components/J40Map.tsx              |   2 +-
 .../MapTribalLayers/MapTribalLayers.tsx       |   1 -
 4 files changed, 12 insertions(+), 148 deletions(-)

diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx
index 0c43afe1..3bcd96e5 100644
--- a/client/src/components/AreaDetail/AreaDetail.tsx
+++ b/client/src/components/AreaDetail/AreaDetail.tsx
@@ -628,53 +628,20 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps)
 
   return (
     <aside className={styles.areaDetailContainer} data-cy={'aside'}>
-
-      {/* Tract Info */}
-      <TractInfo
-        blockGroup={blockGroup}
-        countyName={countyName}
-        stateName={stateName}
-        population={population}
-        sidePanelState={properties[constants.SIDE_PANEL_STATE]}
-      />
-
-      {/* Demographics */}
-      <TractDemographics />
-
-
       {
         isCensusLayerSelected ? (
           <>
-            {/* Census Info  */}
-            <ul className={styles.censusRow}>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.CENSUS_BLOCK_GROUP)}
-                </span>
-                <span className={styles.censusText}>{` ${blockGroup}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.COUNTY)}
-                </span>
-                <span className={styles.censusText}>{` ${countyName}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {properties[constants.SIDE_PANEL_STATE] !== constants.SIDE_PANEL_STATE_VALUES.NATION ?
-                    intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.TERRITORY) :
-                    intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.STATE)
-                  }
-                </span>
-                <span className={styles.censusText}>{` ${stateName}`}</span>
-              </li>
-              <li>
-                <span className={styles.censusLabel}>
-                  {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CBG_INFO.POPULATION)}
-                </span>
-                <span className={styles.censusText}>{` ${population.toLocaleString()}`}</span>
-              </li>
-            </ul>
+            {/* Tract Info */}
+            <TractInfo
+              blockGroup={blockGroup}
+              countyName={countyName}
+              stateName={stateName}
+              population={population}
+              sidePanelState={properties[constants.SIDE_PANEL_STATE]}
+            />
+
+            {/* Demographics */}
+            <TractDemographics />
 
             {/* Disadvantaged? */}
             <div className={styles.categorization}>
diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
index a736bfc5..5115492b 100644
--- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
+++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
@@ -195,40 +195,6 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -746,40 +712,6 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          State: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
@@ -2850,40 +2782,6 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr
         </div>
       </section>
     </div>
-    <ul>
-      <li>
-        <span>
-          Number:
-        </span>
-        <span>
-           98729374234
-        </span>
-      </li>
-      <li>
-        <span>
-          County:
-        </span>
-        <span>
-           Brooklyn
-        </span>
-      </li>
-      <li>
-        <span>
-          Territory: 
-        </span>
-        <span>
-           New York
-        </span>
-      </li>
-      <li>
-        <span>
-          Population:
-        </span>
-        <span>
-           3,435,435
-        </span>
-      </li>
-    </ul>
     <div>
       <div>
         Identified as disadvantaged?
diff --git a/client/src/components/J40Map.tsx b/client/src/components/J40Map.tsx
index a98095ba..cfdca7c2 100644
--- a/client/src/components/J40Map.tsx
+++ b/client/src/components/J40Map.tsx
@@ -431,7 +431,7 @@ const J40Map = ({location}: IJ40Interface) => {
                 {intl.formatMessage(EXPLORE_COPY.MAP.GEOLOC_MSG_LOCATING)}
               </div>}
 
-              <div className={styles.geolocateIcon}>
+              <div>
                 <GeolocateControl
                   positionOptions={{enableHighAccuracy: true}}
                   onGeolocate={onGeolocate}
diff --git a/client/src/components/MapTribalLayers/MapTribalLayers.tsx b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
index 8a4db968..8fe3dce7 100644
--- a/client/src/components/MapTribalLayers/MapTribalLayers.tsx
+++ b/client/src/components/MapTribalLayers/MapTribalLayers.tsx
@@ -96,7 +96,6 @@ const MapTribalLayer = ({
       />
 
       {/* Alaska layer */}
-      {/* // Todo: limit zoom in amount */}
       <Layer
         id={constants.TRIBAL_ALASKA_POINTS_LAYER_ID}
         source-layer={constants.TRIBAL_SOURCE_LAYER}