Merge branch 'main' into DAH-1907-remove-form-scroll-bars

SFDigitalServices · Dec 21, 2023 · 65b9346 · 65b9346
2 parents 24a78fc + 52617c7
commit 65b9346
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 59 deletions.
diff --git a/app/assets/json/housing_counselors.json b/app/assets/json/housing_counselors.json
@@ -15,14 +15,6 @@
       "phone": "(800) 777-7526",
       "website": "https://www.balancepro.org"
     },
-    {
-      "name": "Bayview Hunters Point Multipurpose Senior Services",
-      "languages": ["English", "Cantonese"],
-      "address": "1753 Carroll Avenue",
-      "citystate": "San Francisco, CA 94124",
-      "phone": "(415) 822-1444",
-      "website": "https://bhpmss.org/"
-    },
     {
       "name": "Bill Sorro Housing Program (BiSHoP)",
       "languages":["English", "Spanish", "Arabic"],

diff --git a/app/assets/json/housing_counselors_react.json b/app/assets/json/housing_counselors_react.json
@@ -83,23 +83,6 @@
             "email": "[email protected]",
             "phone": "(415) 865–5555"
         },
-        {
-            "fullName": "Bayview Hunters Point Multi-Purpose Senior Center (BHPMSS)",
-            "shortName": "BHPMSS",
-            "services": [
-                "rental",
-                "seniorOnly"
-            ],
-            "languages": [
-                "cantonese",
-                "english"
-            ],
-            "address": "1753 Carroll Ave",
-            "cityState": "San Francisco, CA 94124",
-            "website": "https://bhpmss.org/",
-            "email": "[email protected]",
-            "phone": "(415) 822-1444"
-        },
         {
             "fullName": "Bill Sorro Housing Program (BiSHoP)",
             "shortName": "BiSHoP",

diff --git a/app/javascript/modules/listingDetails/ListingDetailsImageCard.tsx b/app/javascript/modules/listingDetails/ListingDetailsImageCard.tsx
@@ -21,40 +21,20 @@ const createImageCardProps = (listing: RailsListing) => {
     }
   })
 
-  // We want to support both the imageURL and listing images fields for now
-  // but the hope is to ultimately deprecate that field.
-  // If we have to use the fallback image then we want to disable the image
-  // field from A11Y tools since at that point it is purely decorative.
-  if (!listingImages) {
-    return listing?.imageURL
-      ? {
-          props: {
-            imageUrl: listing.imageURL,
-            description: t("listings.buildingImageAltText"),
-          },
-        }
-      : {
-          props: {
-            imageUrl: fallbackImg,
-            description: "",
-          },
-        }
-  } else {
-    return listingImages.length > 0
-      ? {
-          props: {
-            images: listingImages,
-            description: t("listings.buildingImageAltText"),
-            moreImagesLabel: t("listings.morePhotos"),
-          },
-        }
-      : {
-          props: {
-            imageUrl: fallbackImg,
-            description: "",
-          },
-        }
-  }
+  return listingImages && listingImages.length > 0
+    ? {
+        props: {
+          images: listingImages,
+          description: t("listings.buildingImageAltText"),
+          moreImagesLabel: t("listings.morePhotos"),
+        },
+      }
+    : {
+        props: {
+          imageUrl: fallbackImg,
+          description: "",
+        },
+      }
 }
 
 export const ListingDetailsImageCard = ({ listing }: ListingDetailsImageCardProps) => {