From 2778209fd20c949c9421525032b92f2253992a12 Mon Sep 17 00:00:00 2001 From: danidfra Date: Mon, 3 Mar 2025 15:41:53 -0300 Subject: [PATCH] Fix refresh error --- src/features/explorer/index.tsx | 19 ++++++++++++++----- src/locales/en.json | 1 - 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/features/explorer/index.tsx b/src/features/explorer/index.tsx index 4d3102486..1ad7f29e6 100644 --- a/src/features/explorer/index.tsx +++ b/src/features/explorer/index.tsx @@ -1,7 +1,7 @@ import globeIcon from '@tabler/icons/outline/globe.svg'; import trendIcon from '@tabler/icons/outline/trending-up.svg'; import userIcon from '@tabler/icons/outline/user.svg'; -import { useEffect, useState } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { Route, Switch, useLocation } from 'react-router-dom'; import { useNavigate } from 'react-router-dom-v5-compat'; @@ -100,11 +100,20 @@ const SearchPage = () => { const intl = useIntl(); const dispatch = useAppDispatch(); const navigate = useNavigate(); - - const [selectedFilter, setSelectedFilter] = useState('global'); + const path = useLocation().pathname; const selectFilter = (newActiveFilter: SearchFilter) => dispatch(setFilter(newActiveFilter)); + const selectedValue = useMemo(() => { + if (path === '/explorer') return 'posts'; + if (path === '/explorer/trends') return 'statuses'; + dispatch(setFilter('accounts')); + return 'accounts'; + }, [path, dispatch]); + + + const [selectedFilter, setSelectedFilter] = useState(selectedValue); + const renderFilterBar = () => { const items = []; @@ -116,7 +125,7 @@ const SearchPage = () => { } else { dispatch(setFilter('statuses')); } - setSelectedFilter(filter ?? 'global'); + setSelectedFilter(filter ?? 'posts'); navigate(`/explorer${path}`); }; @@ -124,7 +133,7 @@ const SearchPage = () => { { text: intl.formatMessage(messages.statuses), action: () => handleTabs(''), - name: 'global', + name: 'posts', icon: globeIcon, }, { diff --git a/src/locales/en.json b/src/locales/en.json index 557845708..11324b267 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -463,7 +463,6 @@ "column_forbidden.body": "You do not have permission to access this page.", "column_forbidden.title": "Forbidden", "common.cancel": "Cancel", - "common.search": "Search", "compare_history_modal.header": "Edit history", "compose.character_counter.title": "Used {chars} out of {maxChars} {maxChars, plural, one {character} other {characters}}", "compose.edit_success": "Your post was edited",