diff --git a/src/app/screens/Feeds/SearchFilters.tsx b/src/app/screens/Feeds/SearchFilters.tsx index 5de0388e..e8149c4b 100644 --- a/src/app/screens/Feeds/SearchFilters.tsx +++ b/src/app/screens/Feeds/SearchFilters.tsx @@ -15,69 +15,17 @@ import { import NestedCheckboxList, { type CheckboxStructure, } from '../../components/NestedCheckboxList'; -import AccessRequiredPopover from '../../components/AccessRequiredPopover'; import { useTranslations } from 'next-intl'; import { useRemoteConfig } from '../../context/RemoteConfigProvider'; import { useSealOfReliabilityFilterAccess } from '../../hooks/useSealOfReliabilityFilterAccess'; import { Link } from '../../../i18n/navigation'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; -import LockIcon from '@mui/icons-material/Lock'; import OpenInNewIcon from '@mui/icons-material/OpenInNew'; import { useEffect, useState } from 'react'; import { DATASET_FEATURES, groupFeaturesByComponent } from '../../utils/consts'; import { type GbfsVersionConfig } from '../../interface/RemoteConfig'; import { SearchHeader } from '../../styles/Filters.styles'; -const SEAL_FILTER_ACCESS_FORM_URL = - 'https://docs.google.com/forms/d/1jzrqXkxkRHp_TrRHM6fSxeF2nMX3RSvrAXC2dlovZDU/viewform?edit_requested=true'; - -interface SealFilterRowProps { - checked: boolean; - disabled?: boolean; - locked?: boolean; - onClick?: (event: React.MouseEvent) => void; -} - -function SealFilterRow({ - checked, - disabled, - locked, - onClick, -}: SealFilterRowProps): React.ReactElement { - return ( - - - - - - Seal of Reliability} - slotProps={{ - primary: { - variant: 'body1', - color: locked ? 'text.disabled' : undefined, - }, - }} - /> - - {locked === true && ( - - )} - - - - ); -} function setInitialExpandGroup(): Record { const expandGroup: Record = {}; @@ -142,13 +90,9 @@ export function SearchFilters({ const { config } = useRemoteConfig(); const { isFeatureLive: isSealOfReliabilityLive, - isPending: isSealAccessPending, - hasNoAccess: hasNoSealAccess, + hasAccess: hasSealAccess, } = useSealOfReliabilityFilterAccess(); - const [sealAccessPopoverAnchor, setSealAccessPopoverAnchor] = - useState(null); - const gbfsVersionsObject: GbfsVersionConfig = JSON.parse(config.gbfsVersions); const [expandedCategories, setExpandedCategories] = useState< @@ -261,25 +205,8 @@ export function SearchFilters({ > {isSealOfReliabilityLive && - (!areFeatureFiltersEnabled || isSealAccessPending ? ( - - ) : hasNoSealAccess ? ( - { - setSealAccessPopoverAnchor(e.currentTarget); - }} - /> - ) : ( + hasSealAccess && + areFeatureFiltersEnabled && ( - ))} + )} - {isSealOfReliabilityLive && ( - - {t('sealOfReliabilityLearnMore')} - - - )} - - { - setSealAccessPopoverAnchor(null); - }} - title='Seal of Reliability Filtering Access Required' - description='This feature requires a MobilityData membership. Log in or request access to continue' - requestAccessUrl={SEAL_FILTER_ACCESS_FORM_URL} - /> + {isSealOfReliabilityLive && + hasSealAccess && + areFeatureFiltersEnabled && ( + + {t('sealOfReliabilityLearnMore')} + + + )}