From e4753ec56bf5ba93f89aa35e9768391f21b0c9e0 Mon Sep 17 00:00:00 2001 From: tallulah Date: Wed, 18 Dec 2024 14:59:41 -0800 Subject: [PATCH] feat: DAH-2982 fix merge issues --- app/assets/json/translations/react/en.json | 14 +++++++------- .../modules/listings/GenericDirectory.tsx | 8 -------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/assets/json/translations/react/en.json b/app/assets/json/translations/react/en.json index 8e637f566..fbdd5b660 100644 --- a/app/assets/json/translations/react/en.json +++ b/app/assets/json/translations/react/en.json @@ -916,18 +916,18 @@ "listingDetails.applicationsOpen": "Applications open", "listingDetails.applicationsOpen.withDateTime": "Applications open: %{date} at %{time} Pacific Time", "listingDetails.sales.aside.needHelp": "Housing counselors can help with your application. Support is available in many languages.", + "listingDirectory.emptyListingsView.fcfs": "View %{numListings} listings available through a lottery", + "listingDirectory.emptyListingsView.forRent.subtitle": "We do not have any units for rent through a lottery right now.", + "listingDirectory.emptyListingsView.forSale.subtitle": "We do not have any units for sale through a lottery right now.", + "listingDirectory.emptyListingsView.getAnEmail": "Get an email whenever a new listing is posted", + "listingDirectory.emptyListingsView.open": "View %{numListings} listings available now, no lottery required", + "listingDirectory.emptyListingsView.title.fcfs": "0 open listings", + "listingDirectory.emptyListingsView.title.open": "0 open lotteries", "listingDirectory.listingStatusContent.applicationDeadline": "Application deadline", "listingDirectory.listingStatusContent.applicationsClosed": "Applications closed", "listingDirectory.listingStatusContent.applicationsOpen": "Applications open", "listingDirectory.listingStatusContent.lotteryResultsPosted": "Lottery results posted", "listingDirectory.listingStatusContent.subContent.firstComeFirstServed": "First come, first served", - "listingDirectory.emptyListingsView.title.open": "0 open lotteries", - "listingDirectory.emptyListingsView.title.fcfs": "0 open listings", - "listingDirectory.emptyListingsView.forRent.subtitle": "We do not have any units for rent through a lottery right now.", - "listingDirectory.emptyListingsView.forSale.subtitle": "We do not have any units for sale through a lottery right now.", - "listingDirectory.emptyListingsView.open": "View %{numListings} listings available now, no lottery required", - "listingDirectory.emptyListingsView.fcfs": "View %{numListings} listings available through a lottery", - "listingDirectory.emptyListingsView.getAnEmail": "Get an email whenever a new listing is posted", "listings.HCBS Units.title": "In-home Support for a Disability", "listings.Hearing impairments.title": "Hearing Impairments", "listings.Hearing/Vision (Communication).title": "Hearing/Vision (Communication)", diff --git a/app/javascript/modules/listings/GenericDirectory.tsx b/app/javascript/modules/listings/GenericDirectory.tsx index cd60fc040..05b96a54a 100644 --- a/app/javascript/modules/listings/GenericDirectory.tsx +++ b/app/javascript/modules/listings/GenericDirectory.tsx @@ -174,14 +174,6 @@ export const GenericDirectory = (props: RentalDirectoryProps) => { hasFiltersSet, listings.fcfs.length )} - {props.directoryType === "forSale" && - fcfsSalesView( - listings.fcfs, - props.directoryType, - props.getSummaryTable, - hasFiltersSet, - listings.open.length - )} {props.directoryType === DIRECTORY_TYPE_SALES && (