diff --git a/sites/public/__tests__/components/listing/listing_sections/LeasingAgent.test.tsx b/sites/public/__tests__/components/listing/listing_sections/LeasingAgent.test.tsx index c01255f140..9824e0f9b5 100644 --- a/sites/public/__tests__/components/listing/listing_sections/LeasingAgent.test.tsx +++ b/sites/public/__tests__/components/listing/listing_sections/LeasingAgent.test.tsx @@ -8,6 +8,7 @@ import { import { listing } from "@bloom-housing/shared-helpers/__tests__/testHelpers" import { AuthContext } from "@bloom-housing/shared-helpers" import { screen } from "../../../testUtils" +import * as helpers from "../../../../src/lib/helpers" afterEach(cleanup) @@ -27,12 +28,9 @@ describe("", () => { it("shows all content enableLeasingAgentAltText on", () => { const phoneNumber = "(123) 456-7890" + jest.spyOn(helpers, "isFeatureFlagOn").mockReturnValue(true) render( - true, - }} - > + ", () => { }) it("shows all content enableLeasingAgentAltText off", () => { const phoneNumber = "(123) 456-7890" + jest.spyOn(helpers, "isFeatureFlagOn").mockReturnValue(false) render( - false, - }} - > + { FeatureFlagEnum.disableListingPreferences, listing?.jurisdictions?.id ) - const enableLeasingAgentAltText = doJurisdictionsHaveFeatureFlagOn( - FeatureFlagEnum.enableLeasingAgentAltText, - listing.jurisdictions.id + const enableLeasingAgentAltText = isFeatureFlagOn( + props.jurisdiction, + FeatureFlagEnum.enableLeasingAgentAltText ) const leasingAgentContactText = enableLeasingAgentAltText diff --git a/sites/public/src/components/listing/ListingViewSeeds.tsx b/sites/public/src/components/listing/ListingViewSeeds.tsx index 3e78ccff46..cc63f36bcf 100644 --- a/sites/public/src/components/listing/ListingViewSeeds.tsx +++ b/sites/public/src/components/listing/ListingViewSeeds.tsx @@ -265,7 +265,7 @@ export const ListingViewSeeds = ({ listing, jurisdiction, profile, preview }: Li {LotteryEvent} {ReferralApplication} {WhatToExpect} - + {ListingUpdatedAt} ) diff --git a/sites/public/src/components/listing/listing_sections/LeasingAgent.tsx b/sites/public/src/components/listing/listing_sections/LeasingAgent.tsx index aa8ff04f8b..677d0bf017 100644 --- a/sites/public/src/components/listing/listing_sections/LeasingAgent.tsx +++ b/sites/public/src/components/listing/listing_sections/LeasingAgent.tsx @@ -1,9 +1,14 @@ import * as React from "react" import { Card, Heading, Link } from "@bloom-housing/ui-seeds" -import { Address, AuthContext } from "@bloom-housing/shared-helpers" +import { Address } from "@bloom-housing/shared-helpers" import { t } from "@bloom-housing/ui-components" import styles from "../ListingViewSeeds.module.scss" -import { FeatureFlagEnum, Listing } from "@bloom-housing/shared-helpers/src/types/backend-swagger" +import { + FeatureFlagEnum, + Jurisdiction, + Listing, +} from "@bloom-housing/shared-helpers/src/types/backend-swagger" +import { isFeatureFlagOn } from "../../../lib/helpers" export const formatPhone = (phone: string) => { return phone.replace(/[-() ]/g, "") @@ -11,8 +16,9 @@ export const formatPhone = (phone: string) => { type LeasingAgentProps = { listing: Listing + jurisdiction?: Jurisdiction } -export const LeasingAgent = ({ listing }: LeasingAgentProps) => { +export const LeasingAgent = ({ listing, jurisdiction }: LeasingAgentProps) => { const { listingsLeasingAgentAddress: address, leasingAgentEmail: email, @@ -21,18 +27,14 @@ export const LeasingAgent = ({ listing }: LeasingAgentProps) => { leasingAgentPhone: phone, leasingAgentTitle: title, } = listing - const { doJurisdictionsHaveFeatureFlagOn } = React.useContext(AuthContext) - const managementWebsite = doJurisdictionsHaveFeatureFlagOn( - FeatureFlagEnum.enableCompanyWebsite, - listing.jurisdictions.id - ) + const managementWebsite = isFeatureFlagOn(jurisdiction, FeatureFlagEnum.enableCompanyWebsite) ? listing.managementWebsite : undefined if (!address && !email && !name && !officeHours && !title && !phone && !managementWebsite) return - const enableLeasingAgentAltText = doJurisdictionsHaveFeatureFlagOn( - FeatureFlagEnum.enableLeasingAgentAltText, - listing.jurisdictions.id + const enableLeasingAgentAltText = isFeatureFlagOn( + jurisdiction, + FeatureFlagEnum.enableLeasingAgentAltText ) const leasingAgentContactText = enableLeasingAgentAltText