From c67fc393d5ed05b79a1b0a5e2eb47a7aa7bbe92a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 18 Sep 2023 18:01:22 -0500 Subject: [PATCH] Fix eslint import errors --- src/components/sidebar-menu.tsx | 4 +--- src/features/chats/components/chat-search/chat-search.tsx | 4 +--- src/features/home-timeline/index.tsx | 4 +--- src/pages/group-page.tsx | 4 +--- src/reducers/__tests__/auth.test.ts | 3 +-- src/reducers/suggestions.ts | 3 +-- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx index 11786f4ad..819411133 100644 --- a/src/components/sidebar-menu.tsx +++ b/src/components/sidebar-menu.tsx @@ -9,13 +9,11 @@ import { getSettings } from 'soapbox/actions/settings'; import { closeSidebar } from 'soapbox/actions/sidebar'; import { useAccount } from 'soapbox/api/hooks'; import Account from 'soapbox/components/account'; -import { Stack } from 'soapbox/components/ui'; +import { Stack, Divider, HStack, Icon, IconButton, Text } from 'soapbox/components/ui'; import ProfileStats from 'soapbox/features/ui/components/profile-stats'; import { useAppDispatch, useAppSelector, useGroupsPath, useFeatures } from 'soapbox/hooks'; import { makeGetOtherAccounts } from 'soapbox/selectors'; -import { Divider, HStack, Icon, IconButton, Text } from './ui'; - import type { List as ImmutableList } from 'immutable'; import type { Account as AccountEntity } from 'soapbox/types/entities'; diff --git a/src/features/chats/components/chat-search/chat-search.tsx b/src/features/chats/components/chat-search/chat-search.tsx index 8197ac5f5..d93acc348 100644 --- a/src/features/chats/components/chat-search/chat-search.tsx +++ b/src/features/chats/components/chat-search/chat-search.tsx @@ -7,13 +7,11 @@ import { useHistory } from 'react-router-dom'; import { Icon, Input, Stack } from 'soapbox/components/ui'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context'; import { useDebounce } from 'soapbox/hooks'; -import { useChats } from 'soapbox/queries/chats'; +import { useChats, ChatKeys } from 'soapbox/queries/chats'; import { queryClient } from 'soapbox/queries/client'; import useAccountSearch from 'soapbox/queries/search'; import toast from 'soapbox/toast'; -import { ChatKeys } from '../../../../queries/chats'; - import Blankslate from './blankslate'; import EmptyResultsBlankslate from './empty-results-blankslate'; import Results from './results'; diff --git a/src/features/home-timeline/index.tsx b/src/features/home-timeline/index.tsx index 57c19b777..7f141ad6b 100644 --- a/src/features/home-timeline/index.tsx +++ b/src/features/home-timeline/index.tsx @@ -4,14 +4,12 @@ import { Link } from 'react-router-dom'; import { fetchRelationships } from 'soapbox/actions/accounts'; import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions'; -import { expandHomeTimeline } from 'soapbox/actions/timelines'; +import { expandHomeTimeline, clearFeedAccountId } from 'soapbox/actions/timelines'; import PullToRefresh from 'soapbox/components/pull-to-refresh'; import { Column, Stack, Text } from 'soapbox/components/ui'; import Timeline from 'soapbox/features/ui/components/timeline'; import { useAppSelector, useAppDispatch, useFeatures, useInstance } from 'soapbox/hooks'; -import { clearFeedAccountId } from '../../actions/timelines'; - const messages = defineMessages({ title: { id: 'column.home', defaultMessage: 'Home' }, }); diff --git a/src/pages/group-page.tsx b/src/pages/group-page.tsx index 8983b57e2..85dc8b9db 100644 --- a/src/pages/group-page.tsx +++ b/src/pages/group-page.tsx @@ -4,7 +4,7 @@ import { useRouteMatch } from 'react-router-dom'; import { useGroup, useGroupMembershipRequests } from 'soapbox/api/hooks'; import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc'; -import { Column, Icon, Layout, Stack, Text } from 'soapbox/components/ui'; +import { Column, Icon, Layout, Stack, Text, Tabs } from 'soapbox/components/ui'; import GroupHeader from 'soapbox/features/group/components/group-header'; import LinkFooter from 'soapbox/features/ui/components/link-footer'; import BundleContainer from 'soapbox/features/ui/containers/bundle-container'; @@ -16,8 +16,6 @@ import { } from 'soapbox/features/ui/util/async-components'; import { useFeatures, useOwnAccount } from 'soapbox/hooks'; -import { Tabs } from '../components/ui'; - import type { Group } from 'soapbox/schemas'; const messages = defineMessages({ diff --git a/src/reducers/__tests__/auth.test.ts b/src/reducers/__tests__/auth.test.ts index d461b3ddd..b6daa1614 100644 --- a/src/reducers/__tests__/auth.test.ts +++ b/src/reducers/__tests__/auth.test.ts @@ -11,9 +11,8 @@ import { import { ME_FETCH_SKIP } from 'soapbox/actions/me'; import { MASTODON_PRELOAD_IMPORT } from 'soapbox/actions/preload'; import { buildAccount } from 'soapbox/jest/factory'; -import { AuthAppRecord, AuthTokenRecord, AuthUserRecord, ReducerRecord } from 'soapbox/reducers/auth'; -import reducer from '../auth'; +import reducer, { AuthAppRecord, AuthTokenRecord, AuthUserRecord, ReducerRecord } from '../auth'; describe('auth reducer', () => { it('should return the initial state', () => { diff --git a/src/reducers/suggestions.ts b/src/reducers/suggestions.ts index 81d0d9a2f..52fbb2a0d 100644 --- a/src/reducers/suggestions.ts +++ b/src/reducers/suggestions.ts @@ -11,10 +11,9 @@ import { SUGGESTIONS_V2_FETCH_SUCCESS, SUGGESTIONS_V2_FETCH_FAIL, SUGGESTIONS_TRUTH_FETCH_SUCCESS, + type SuggestedProfile, } from 'soapbox/actions/suggestions'; -import { SuggestedProfile } from '../actions/suggestions'; - import type { AnyAction } from 'redux'; import type { APIEntity } from 'soapbox/types/entities';