diff --git a/app/soapbox/features/compose/components/search_results.tsx b/app/soapbox/features/compose/components/search_results.tsx index d3fa555fa..2543e3626 100644 --- a/app/soapbox/features/compose/components/search_results.tsx +++ b/app/soapbox/features/compose/components/search_results.tsx @@ -29,20 +29,8 @@ const messages = defineMessages({ type SearchFilter = 'accounts' | 'statuses' | 'hashtags'; -interface ISearchResults { - value: string, - results: ImmutableMap, - submitted: boolean, - expandSearch: (filter: SearchFilter) => void, - selectedFilter: SearchFilter, - selectFilter: (filter: SearchFilter) => void, - suggestions: ImmutableList, - trendingStatuses: ImmutableList, - trends: ImmutableList, -} - /** Displays search results depending on the active tab. */ -const SearchResults: React.FC = () => { +const SearchResults: React.FC = () => { const intl = useIntl(); const dispatch = useAppDispatch(); diff --git a/app/soapbox/features/compose/containers/search_results_container.js b/app/soapbox/features/compose/containers/search_results_container.js deleted file mode 100644 index 4ab9b712f..000000000 --- a/app/soapbox/features/compose/containers/search_results_container.js +++ /dev/null @@ -1,33 +0,0 @@ -import { connect } from 'react-redux'; - -import { fetchTrendingStatuses } from 'soapbox/actions/trending_statuses'; -import { getFeatures } from 'soapbox/utils/features'; - -import { expandSearch, setFilter } from '../../../actions/search'; -import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestions'; -import SearchResults from '../components/search_results'; - -const mapStateToProps = state => { - const instance = state.get('instance'); - - return { - value: state.getIn(['search', 'submittedValue']), - results: state.getIn(['search', 'results']), - suggestions: state.getIn(['suggestions', 'items']), - trendingStatuses: state.getIn(['trending_statuses', 'items']), - trends: state.getIn(['trends', 'items']), - submitted: state.getIn(['search', 'submitted']), - selectedFilter: state.getIn(['search', 'filter']), - features: getFeatures(instance), - }; -}; - -const mapDispatchToProps = dispatch => ({ - fetchSuggestions: () => dispatch(fetchSuggestions()), - fetchTrendingStatuses: () => dispatch(fetchTrendingStatuses()), - expandSearch: type => dispatch(expandSearch(type)), - dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))), - selectFilter: newActiveFilter => dispatch(setFilter(newActiveFilter)), -}); - -export default connect(mapStateToProps, mapDispatchToProps)(SearchResults); diff --git a/app/soapbox/features/search/index.tsx b/app/soapbox/features/search/index.tsx index 3fdf625f6..c17691c37 100644 --- a/app/soapbox/features/search/index.tsx +++ b/app/soapbox/features/search/index.tsx @@ -3,7 +3,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { Column } from 'soapbox/components/ui'; import Search from 'soapbox/features/compose/components/search'; -import SearchResultsContainer from 'soapbox/features/compose/containers/search_results_container'; +import SearchResults from 'soapbox/features/compose/components/search_results'; const messages = defineMessages({ heading: { id: 'column.search', defaultMessage: 'Search' }, @@ -16,7 +16,7 @@ const SearchPage = () => {
- +
);