diff --git a/app/javascript/flavours/glitch/features/explore/index.tsx b/app/javascript/flavours/glitch/features/explore/index.tsx index 4e5133d3fb..1bfa5bb6b3 100644 --- a/app/javascript/flavours/glitch/features/explore/index.tsx +++ b/app/javascript/flavours/glitch/features/explore/index.tsx @@ -5,7 +5,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; import { NavLink, Switch, Route } from 'react-router-dom'; -import ExploreIcon from '@/material-icons/400-24px/explore.svg?react'; +import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react'; import { Column } from 'flavours/glitch/components/column'; import type { ColumnRef } from 'flavours/glitch/components/column'; import { ColumnHeader } from 'flavours/glitch/components/column_header'; @@ -20,7 +20,7 @@ import Suggestions from './suggestions'; import Tags from './tags'; const messages = defineMessages({ - title: { id: 'explore.title', defaultMessage: 'Explore' }, + title: { id: 'explore.title', defaultMessage: 'Trending' }, }); const Explore: React.FC<{ multiColumn: boolean }> = ({ multiColumn }) => { @@ -41,7 +41,7 @@ const Explore: React.FC<{ multiColumn: boolean }> = ({ multiColumn }) => { > - - - ); - if (!isLoading && links.isEmpty()) { return (
- {banner} -
@@ -63,8 +55,6 @@ class Links extends PureComponent { return (
- {banner} - {isLoading ? () : links.map((link, i) => ( } alwaysPrepend timelineId='explore' statusIds={statusIds} diff --git a/app/javascript/flavours/glitch/features/explore/tags.jsx b/app/javascript/flavours/glitch/features/explore/tags.jsx index 27d789c5e3..14c221fa40 100644 --- a/app/javascript/flavours/glitch/features/explore/tags.jsx +++ b/app/javascript/flavours/glitch/features/explore/tags.jsx @@ -42,17 +42,9 @@ class Tags extends PureComponent { render () { const { isLoading, hashtags } = this.props; - const banner = ( - - - - ); - if (!isLoading && hashtags.isEmpty()) { return (
- {banner} -
@@ -62,8 +54,6 @@ class Tags extends PureComponent { return (
- {banner} - {isLoading ? () : hashtags.map(hashtag => ( ))} diff --git a/app/javascript/flavours/glitch/features/link_timeline/index.tsx b/app/javascript/flavours/glitch/features/link_timeline/index.tsx index 883835e2f0..bf4763895b 100644 --- a/app/javascript/flavours/glitch/features/link_timeline/index.tsx +++ b/app/javascript/flavours/glitch/features/link_timeline/index.tsx @@ -3,7 +3,7 @@ import { useRef, useEffect, useCallback } from 'react'; import { Helmet } from 'react-helmet'; import { useParams } from 'react-router-dom'; -import ExploreIcon from '@/material-icons/400-24px/explore.svg?react'; +import TrendingUpIcon from '@/material-icons/400-24px/trending_up.svg?react'; import { expandLinkTimeline } from 'flavours/glitch/actions/timelines'; import { Column } from 'flavours/glitch/components/column'; import type { ColumnRef } from 'flavours/glitch/components/column'; @@ -50,7 +50,7 @@ export const LinkTimeline: React.FC<{ { transparent to='/explore' icon='explore' - iconComponent={ExploreIcon} - activeIconComponent={ExploreActiveIcon} + iconComponent={TrendingUpIcon} text={intl.formatMessage(messages.explore)} /> );