Merge branch 'main' into preselect-jurisdiction

Author: emilyjablonski

sites/public/src/components/listing/ListingView.tsx

@@ -512,11 +512,15 @@ export const ListingView = (props: ListingProps) => {
     return (
       <QuantityRowSection
         quantityRows={
-          listing.reviewOrderType === ReviewOrderTypeEnum.waitlist ? waitlistRow : unitRow
+          listing.reviewOrderType === ReviewOrderTypeEnum.waitlist ||
+          listing.reviewOrderType === ReviewOrderTypeEnum.waitlistLottery
+            ? waitlistRow
+            : unitRow
         }
         strings={{
           sectionTitle:
-            listing.reviewOrderType === ReviewOrderTypeEnum.waitlist
+            listing.reviewOrderType === ReviewOrderTypeEnum.waitlist ||
+            listing.reviewOrderType === ReviewOrderTypeEnum.waitlistLottery
               ? t("listings.waitlist.isOpen")
               : t("listings.vacantUnitsAvailable"),
           description: description(),

sites/public/src/components/listing/listing_sections/Availability.tsx

@@ -246,6 +246,7 @@ export const Availability = ({ listing, jurisdiction }: AvailabilityProps) => {
         case ReviewOrderTypeEnum.lottery:
           return [lotteryContent]
         case ReviewOrderTypeEnum.waitlist:
+        case ReviewOrderTypeEnum.waitlistLottery:
           return [waitlistContent]
         default:
           return [fcfsContent]