diff --git a/webapp/src/components/RankingsTable/RankingsTable.container.ts b/webapp/src/components/RankingsTable/RankingsTable.container.ts index ed5f554f6..d02ea7dfc 100644 --- a/webapp/src/components/RankingsTable/RankingsTable.container.ts +++ b/webapp/src/components/RankingsTable/RankingsTable.container.ts @@ -2,7 +2,6 @@ import { connect } from 'react-redux' import { isLoadingType } from 'decentraland-dapps/dist/modules/loading/selectors' import { fetchRankingsRequest, FETCH_RANKINGS_REQUEST } from '../../modules/analytics/actions' import { getRankingsData, getLoading } from '../../modules/analytics/selectors' -import { getIsExoticRarityEnabled } from '../../modules/features/selectors' import { RootState } from '../../modules/reducer' import RankingsTable from './RankingsTable' import { MapStateProps, MapDispatch, MapDispatchProps } from './RankingsTable.types' @@ -11,7 +10,6 @@ const mapState = (state: RootState): MapStateProps => { const data = getRankingsData(state) return { data, - isExoticRarityEnabled: getIsExoticRarityEnabled(state), isLoading: isLoadingType(getLoading(state), FETCH_RANKINGS_REQUEST) } } diff --git a/webapp/src/components/RankingsTable/RankingsTable.tsx b/webapp/src/components/RankingsTable/RankingsTable.tsx index 0b420fcec..9258022b9 100644 --- a/webapp/src/components/RankingsTable/RankingsTable.tsx +++ b/webapp/src/components/RankingsTable/RankingsTable.tsx @@ -30,7 +30,7 @@ const INITIAL_FILTERS = { const TABS_PREFIX = '#rankings-' const RankingsTable = (props: Props) => { - const { isLoading, isExoticRarityEnabled, onFetchRankings, data } = props + const { isLoading, onFetchRankings, data } = props const history = useHistory() const location = useLocation() @@ -113,13 +113,10 @@ const RankingsTable = (props: Props) => { value={currentFilters.rarity || ALL_FILTER} direction="right" // eslint-disable-next-line @typescript-eslint/no-unsafe-argument - options={[ALL_FILTER, ...Rarity.getRarities()] - .filter(rarity => isExoticRarityEnabled || (rarity as Rarity) !== Rarity.EXOTIC) - .map(rarity => ({ - value: rarity, - text: - rarity === ALL_FILTER ? t('home_page.analytics.rankings.all_rarities') : t(`rarity.${convertToOutputString(rarity)}`) - }))} + options={[ALL_FILTER, ...Rarity.getRarities()].map(rarity => ({ + value: rarity, + text: rarity === ALL_FILTER ? t('home_page.analytics.rankings.all_rarities') : t(`rarity.${convertToOutputString(rarity)}`) + }))} onChange={registerHandleFilterChange('rarity')} /> diff --git a/webapp/src/components/RankingsTable/RankingsTable.types.ts b/webapp/src/components/RankingsTable/RankingsTable.types.ts index 64702b134..f0211cd67 100644 --- a/webapp/src/components/RankingsTable/RankingsTable.types.ts +++ b/webapp/src/components/RankingsTable/RankingsTable.types.ts @@ -5,10 +5,9 @@ import { RankingEntity } from '../../modules/analytics/types' export type Props = { data: RankingEntity[] | null isLoading: boolean - isExoticRarityEnabled: boolean onFetchRankings: typeof fetchRankingsRequest } -export type MapStateProps = Pick +export type MapStateProps = Pick export type MapDispatchProps = Pick export type MapDispatch = Dispatch diff --git a/webapp/src/modules/features/selectors.ts b/webapp/src/modules/features/selectors.ts index 0b3e5a2e1..1938a122c 100644 --- a/webapp/src/modules/features/selectors.ts +++ b/webapp/src/modules/features/selectors.ts @@ -76,10 +76,3 @@ export const getIsLandCrossChainEnabled = (state: RootState) => { } return false } - -export const getIsExoticRarityEnabled = (state: RootState) => { - if (hasLoadedInitialFlags(state)) { - return getIsFeatureEnabled(state, ApplicationName.DAPPS, FeatureName.EXOTIC_RARITY) - } - return false -} diff --git a/webapp/src/modules/features/types.ts b/webapp/src/modules/features/types.ts index 6bdf0c110..295d94bbe 100644 --- a/webapp/src/modules/features/types.ts +++ b/webapp/src/modules/features/types.ts @@ -7,6 +7,5 @@ export enum FeatureName { SMART_WEARABLES_FTU = 'smart-wearables-ftu', MARKETPLACE_SERVER = 'marketplace-server', CHAIN_SELECTOR = 'chain-selector', - CROSS_CHAIN_LANDS = 'cross-chain-lands', - EXOTIC_RARITY = 'exotic-rarity' + CROSS_CHAIN_LANDS = 'cross-chain-lands' }