From 512a28eafd6421c1799d5aed847353739a614f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sun, 20 Oct 2024 01:10:05 +0200 Subject: [PATCH] pl-fe: Remove more barrel exports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- packages/pl-fe/src/actions/accounts.test.ts | 2 +- packages/pl-fe/src/actions/export-data.ts | 2 +- packages/pl-fe/src/actions/importer/index.ts | 3 ++- .../src/api/hooks/accounts/useAccount.ts | 2 +- .../src/api/hooks/accounts/useAccountList.ts | 2 +- .../api/hooks/accounts/useAccountLookup.ts | 2 +- .../src/api/hooks/admin/useAnnouncements.ts | 2 +- .../hooks/announcements/useAnnouncements.ts | 2 +- .../groups/useGroupMembershipRequests.ts | 2 +- .../pl-fe/src/components/birthday-input.tsx | 3 ++- packages/pl-fe/src/components/gdpr-banner.tsx | 3 ++- packages/pl-fe/src/components/helmet.tsx | 4 +++- packages/pl-fe/src/components/modal-root.tsx | 3 ++- .../src/components/quoted-status.test.tsx | 3 ++- .../pl-fe/src/components/sidebar-menu.tsx | 6 ++++- .../src/components/sidebar-navigation.tsx | 8 ++++++- .../src/components/site-error-boundary.tsx | 3 ++- .../src/components/status-action-bar.tsx | 7 +++++- .../src/components/status-reactions-bar.tsx | 5 ++++- .../pl-fe/src/components/thumb-navigation.tsx | 5 ++++- .../pl-fe/src/components/translate-button.tsx | 6 ++++- packages/pl-fe/src/features/about/index.tsx | 4 +++- .../src/features/account-timeline/index.tsx | 5 ++++- .../features/account/components/header.tsx | 5 ++++- .../src/features/admin/tabs/dashboard.tsx | 4 +++- packages/pl-fe/src/features/aliases/index.tsx | 5 ++++- .../auth-login/components/password-reset.tsx | 3 ++- .../components/registration-form.tsx | 5 ++++- .../components/registration-page.tsx | 3 ++- .../pl-fe/src/features/bookmarks/index.tsx | 4 +++- .../src/features/bubble-timeline/index.tsx | 4 +++- .../components/chat-page-settings.tsx | 4 +++- packages/pl-fe/src/features/circle/index.tsx | 3 ++- .../src/features/community-timeline/index.tsx | 4 +++- .../compose/components/compose-form.tsx | 7 +++++- .../components/content-type-button.tsx | 4 +++- .../compose/components/language-dropdown.tsx | 5 ++++- .../compose/components/polls/poll-form.tsx | 4 +++- .../compose/components/privacy-dropdown.tsx | 5 ++++- .../compose/components/reply-mentions.tsx | 3 ++- .../features/compose/components/upload.tsx | 4 +++- .../containers/reply-indicator-container.tsx | 4 +++- .../compose/containers/warning-container.tsx | 3 ++- .../compose/editor/plugins/state-plugin.tsx | 3 ++- .../components/crypto-donate-panel.tsx | 3 ++- .../src/features/delete-account/index.tsx | 3 ++- .../src/features/developers/apps/create.tsx | 3 ++- .../pl-fe/src/features/directory/index.tsx | 5 ++++- .../pl-fe/src/features/edit-profile/index.tsx | 6 ++++- .../src/features/embedded-status/index.tsx | 4 +++- .../components/emoji-picker-dropdown.tsx | 5 ++++- .../event/components/event-header.tsx | 5 ++++- .../src/features/event/event-information.tsx | 4 +++- .../features/favourited-statuses/index.tsx | 4 +++- .../federation-restrictions/index.tsx | 3 ++- .../src/features/filters/edit-filter.tsx | 3 ++- .../src/features/group/group-timeline.tsx | 5 ++++- .../src/features/hashtag-timeline/index.tsx | 6 ++++- .../src/features/home-timeline/index.tsx | 6 ++++- .../src/features/landing-timeline/index.tsx | 4 +++- .../src/features/list-timeline/index.tsx | 4 +++- .../notifications/components/filter-bar.tsx | 4 +++- .../notifications/components/notification.tsx | 5 ++++- .../features/onboarding/onboarding-wizard.tsx | 3 ++- .../steps/avatar-selection-step.tsx | 3 ++- .../features/onboarding/steps/bio-step.tsx | 3 ++- .../steps/cover-photo-selection-step.tsx | 3 ++- .../onboarding/steps/display-name-step.tsx | 3 ++- .../onboarding/steps/fediverse-step.tsx | 3 ++- .../pl-fe/src/features/pl-fe-config/index.tsx | 4 +++- .../pl-fe/src/features/preferences/index.tsx | 4 +++- .../src/features/public-timeline/index.tsx | 5 ++++- packages/pl-fe/src/features/quotes/index.tsx | 4 +++- .../src/features/remote-timeline/index.tsx | 4 +++- .../pl-fe/src/features/settings/index.tsx | 5 ++++- .../status/components/thread-login-cta.tsx | 3 ++- packages/pl-fe/src/features/status/index.tsx | 4 +++- .../src/features/test-timeline/index.tsx | 3 ++- .../pl-fe/src/features/theme-editor/index.tsx | 4 +++- .../features/ui/components/action-button.tsx | 4 +++- .../modals/account-moderation-modal/index.tsx | 4 +++- .../ui/components/modals/compose-modal.tsx | 4 +++- .../ui/components/modals/event-map-modal.tsx | 3 ++- .../ui/components/modals/hotkeys-modal.tsx | 3 ++- .../manage-group-modal/steps/details-step.tsx | 3 ++- .../modals/reply-mentions-modal.tsx | 4 +++- .../components/modals/report-modal/index.tsx | 4 +++- .../report-modal/steps/other-actions-step.tsx | 3 ++- .../components/modals/unauthorized-modal.tsx | 6 ++++- .../components/panels/instance-info-panel.tsx | 4 +++- .../panels/instance-moderation-panel.tsx | 3 ++- .../components/panels/profile-info-panel.tsx | 3 ++- .../ui/components/panels/promo-panel.tsx | 4 +++- .../ui/components/panels/sign-up-panel.tsx | 5 ++++- .../ui/components/panels/user-panel.tsx | 3 ++- packages/pl-fe/src/features/ui/index.tsx | 9 +++++++- .../src/features/ui/util/global-hotkeys.tsx | 3 ++- .../features/ui/util/react-router-helpers.tsx | 3 ++- packages/pl-fe/src/hooks/index.ts | 22 ------------------- packages/pl-fe/src/init/pl-fe-head.tsx | 10 ++++----- packages/pl-fe/src/init/pl-fe-load.tsx | 10 ++++----- packages/pl-fe/src/init/pl-fe-mount.tsx | 10 ++++----- packages/pl-fe/src/layouts/default-layout.tsx | 3 ++- packages/pl-fe/src/layouts/event-layout.tsx | 3 ++- .../src/layouts/external-login-layout.tsx | 3 ++- packages/pl-fe/src/layouts/home-layout.tsx | 7 +++++- packages/pl-fe/src/layouts/landing-layout.tsx | 3 ++- packages/pl-fe/src/layouts/profile-layout.tsx | 4 +++- .../src/layouts/remote-instance-layout.tsx | 3 ++- packages/pl-fe/src/layouts/search-layout.tsx | 3 ++- packages/pl-fe/src/layouts/status-layout.tsx | 3 ++- packages/pl-fe/src/queries/accounts.ts | 3 ++- packages/pl-fe/src/queries/chats.ts | 7 +++++- packages/pl-fe/src/queries/suggestions.ts | 3 ++- packages/pl-fe/src/queries/trends.ts | 3 ++- packages/pl-fe/src/reducers/admin.ts | 2 +- 116 files changed, 335 insertions(+), 152 deletions(-) delete mode 100644 packages/pl-fe/src/hooks/index.ts diff --git a/packages/pl-fe/src/actions/accounts.test.ts b/packages/pl-fe/src/actions/accounts.test.ts index d2cff37de..ef59f6708 100644 --- a/packages/pl-fe/src/actions/accounts.test.ts +++ b/packages/pl-fe/src/actions/accounts.test.ts @@ -3,7 +3,7 @@ import { Map as ImmutableMap } from 'immutable'; import { __stub } from 'pl-fe/api'; import { buildInstance, buildRelationship } from 'pl-fe/jest/factory'; import { mockStore, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeAccount } from 'pl-fe/normalizers'; +import { normalizeAccount } from 'pl-fe/normalizers/account'; import { ListRecord, ReducerRecord } from 'pl-fe/reducers/user-lists'; import { diff --git a/packages/pl-fe/src/actions/export-data.ts b/packages/pl-fe/src/actions/export-data.ts index 2c26861cd..d91b1760b 100644 --- a/packages/pl-fe/src/actions/export-data.ts +++ b/packages/pl-fe/src/actions/export-data.ts @@ -1,7 +1,7 @@ import { defineMessages } from 'react-intl'; import { getClient } from 'pl-fe/api'; -import { normalizeAccount } from 'pl-fe/normalizers'; +import { normalizeAccount } from 'pl-fe/normalizers/account'; import toast from 'pl-fe/toast'; import type { Account, PaginatedResponse } from 'pl-api'; diff --git a/packages/pl-fe/src/actions/importer/index.ts b/packages/pl-fe/src/actions/importer/index.ts index 7ee356d54..8315825dd 100644 --- a/packages/pl-fe/src/actions/importer/index.ts +++ b/packages/pl-fe/src/actions/importer/index.ts @@ -1,6 +1,7 @@ import { importEntities } from 'pl-fe/entity-store/actions'; import { Entities } from 'pl-fe/entity-store/entities'; -import { normalizeAccount, normalizeGroup } from 'pl-fe/normalizers'; +import { normalizeAccount } from 'pl-fe/normalizers/account'; +import { normalizeGroup } from 'pl-fe/normalizers/group'; import type { Account as BaseAccount, Group, Poll, Status as BaseStatus } from 'pl-api'; import type { AppDispatch } from 'pl-fe/store'; diff --git a/packages/pl-fe/src/api/hooks/accounts/useAccount.ts b/packages/pl-fe/src/api/hooks/accounts/useAccount.ts index f15310bfd..70a97262d 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useAccount.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useAccount.ts @@ -7,7 +7,7 @@ import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; import { useClient } from 'pl-fe/hooks/useClient'; import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; -import { type Account, normalizeAccount } from 'pl-fe/normalizers'; +import { type Account, normalizeAccount } from 'pl-fe/normalizers/account'; import { useAccountScrobble } from './useAccountScrobble'; import { useRelationship } from './useRelationship'; diff --git a/packages/pl-fe/src/api/hooks/accounts/useAccountList.ts b/packages/pl-fe/src/api/hooks/accounts/useAccountList.ts index 70d8142f1..558be5cb2 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useAccountList.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useAccountList.ts @@ -2,7 +2,7 @@ import { useInfiniteQuery } from '@tanstack/react-query'; import { Entities } from 'pl-fe/entity-store/entities'; import { useClient } from 'pl-fe/hooks/useClient'; -import { type Account, normalizeAccount } from 'pl-fe/normalizers'; +import { type Account, normalizeAccount } from 'pl-fe/normalizers/account'; import { flattenPages } from 'pl-fe/utils/queries'; import { useRelationships } from './useRelationships'; diff --git a/packages/pl-fe/src/api/hooks/accounts/useAccountLookup.ts b/packages/pl-fe/src/api/hooks/accounts/useAccountLookup.ts index b7025d28b..d0a050262 100644 --- a/packages/pl-fe/src/api/hooks/accounts/useAccountLookup.ts +++ b/packages/pl-fe/src/api/hooks/accounts/useAccountLookup.ts @@ -6,7 +6,7 @@ import { useEntityLookup } from 'pl-fe/entity-store/hooks/useEntityLookup'; import { useClient } from 'pl-fe/hooks/useClient'; import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; -import { type Account, normalizeAccount } from 'pl-fe/normalizers'; +import { type Account, normalizeAccount } from 'pl-fe/normalizers/account'; import { useAccountScrobble } from './useAccountScrobble'; import { useRelationship } from './useRelationship'; diff --git a/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts b/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts index db9f2a1ff..c20dc1ce9 100644 --- a/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts +++ b/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts @@ -8,7 +8,7 @@ import { import * as v from 'valibot'; import { useClient } from 'pl-fe/hooks/useClient'; -import { normalizeAnnouncement, AdminAnnouncement } from 'pl-fe/normalizers'; +import { normalizeAnnouncement, AdminAnnouncement } from 'pl-fe/normalizers/announcement'; import { queryClient } from 'pl-fe/queries/client'; import { useAnnouncements as useUserAnnouncements } from '../announcements/useAnnouncements'; diff --git a/packages/pl-fe/src/api/hooks/announcements/useAnnouncements.ts b/packages/pl-fe/src/api/hooks/announcements/useAnnouncements.ts index c928ea9f6..d505fd38c 100644 --- a/packages/pl-fe/src/api/hooks/announcements/useAnnouncements.ts +++ b/packages/pl-fe/src/api/hooks/announcements/useAnnouncements.ts @@ -3,7 +3,7 @@ import { announcementReactionSchema, type AnnouncementReaction } from 'pl-api'; import * as v from 'valibot'; import { useClient } from 'pl-fe/hooks/useClient'; -import { type Announcement, normalizeAnnouncement } from 'pl-fe/normalizers'; +import { type Announcement, normalizeAnnouncement } from 'pl-fe/normalizers/announcement'; import { queryClient } from 'pl-fe/queries/client'; const updateReaction = (reaction: AnnouncementReaction, count: number, me?: boolean, overwrite?: boolean) => v.parse(announcementReactionSchema, { diff --git a/packages/pl-fe/src/api/hooks/groups/useGroupMembershipRequests.ts b/packages/pl-fe/src/api/hooks/groups/useGroupMembershipRequests.ts index 2563f5b1f..ead857e73 100644 --- a/packages/pl-fe/src/api/hooks/groups/useGroupMembershipRequests.ts +++ b/packages/pl-fe/src/api/hooks/groups/useGroupMembershipRequests.ts @@ -4,7 +4,7 @@ import { Entities } from 'pl-fe/entity-store/entities'; import { useDismissEntity } from 'pl-fe/entity-store/hooks/useDismissEntity'; import { useEntities } from 'pl-fe/entity-store/hooks/useEntities'; import { useClient } from 'pl-fe/hooks/useClient'; -import { normalizeAccount } from 'pl-fe/normalizers'; +import { normalizeAccount } from 'pl-fe/normalizers/account'; import { useGroupRelationship } from './useGroupRelationship'; diff --git a/packages/pl-fe/src/components/birthday-input.tsx b/packages/pl-fe/src/components/birthday-input.tsx index 0fcb8fdf6..f321686b0 100644 --- a/packages/pl-fe/src/components/birthday-input.tsx +++ b/packages/pl-fe/src/components/birthday-input.tsx @@ -3,7 +3,8 @@ import { defineMessages, useIntl } from 'react-intl'; import IconButton from 'pl-fe/components/icon-button'; import { DatePicker } from 'pl-fe/features/ui/util/async-components'; -import { useInstance, useFeatures } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; const messages = defineMessages({ birthdayPlaceholder: { id: 'edit_profile.fields.birthday_placeholder', defaultMessage: 'Your birthday' }, diff --git a/packages/pl-fe/src/components/gdpr-banner.tsx b/packages/pl-fe/src/components/gdpr-banner.tsx index 92e9a1ecf..3dec3dbf5 100644 --- a/packages/pl-fe/src/components/gdpr-banner.tsx +++ b/packages/pl-fe/src/components/gdpr-banner.tsx @@ -7,7 +7,8 @@ import Button from 'pl-fe/components/ui/button'; import HStack from 'pl-fe/components/ui/hstack'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useInstance, usePlFeConfig } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; const acceptedGdpr = !!localStorage.getItem('plfe:gdpr'); diff --git a/packages/pl-fe/src/components/helmet.tsx b/packages/pl-fe/src/components/helmet.tsx index 7b1aee72c..7e5be97a5 100644 --- a/packages/pl-fe/src/components/helmet.tsx +++ b/packages/pl-fe/src/components/helmet.tsx @@ -2,7 +2,9 @@ import React from 'react'; import { Helmet as ReactHelmet } from 'react-helmet-async'; import { useStatContext } from 'pl-fe/contexts/stat-context'; -import { useAppSelector, useInstance, useSettings } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { RootState } from 'pl-fe/store'; import FaviconService from 'pl-fe/utils/favicon-service'; diff --git a/packages/pl-fe/src/components/modal-root.tsx b/packages/pl-fe/src/components/modal-root.tsx index a298b1f62..2179ded0f 100644 --- a/packages/pl-fe/src/components/modal-root.tsx +++ b/packages/pl-fe/src/components/modal-root.tsx @@ -6,7 +6,8 @@ import 'wicg-inert'; import { cancelReplyCompose } from 'pl-fe/actions/compose'; import { saveDraftStatus } from 'pl-fe/actions/draft-statuses'; -import { useAppDispatch, usePrevious } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { usePrevious } from 'pl-fe/hooks/usePrevious'; import { useModalsStore } from 'pl-fe/stores/modals'; import type { ModalType } from 'pl-fe/features/ui/components/modal-root'; diff --git a/packages/pl-fe/src/components/quoted-status.test.tsx b/packages/pl-fe/src/components/quoted-status.test.tsx index c979ce3e7..a5dac5119 100644 --- a/packages/pl-fe/src/components/quoted-status.test.tsx +++ b/packages/pl-fe/src/components/quoted-status.test.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { render, screen, rootState } from 'pl-fe/jest/test-helpers'; -import { normalizeStatus, normalizeAccount } from 'pl-fe/normalizers'; +import { normalizeAccount } from 'pl-fe/normalizers/account'; +import { normalizeStatus } from 'pl-fe/normalizers/status'; import QuotedStatus from './quoted-status'; diff --git a/packages/pl-fe/src/components/sidebar-menu.tsx b/packages/pl-fe/src/components/sidebar-menu.tsx index 5abc982b8..e4f8e46b2 100644 --- a/packages/pl-fe/src/components/sidebar-menu.tsx +++ b/packages/pl-fe/src/components/sidebar-menu.tsx @@ -13,7 +13,11 @@ import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import ProfileStats from 'pl-fe/features/ui/components/profile-stats'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance, useRegistrationStatus } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useRegistrationStatus } from 'pl-fe/hooks/useRegistrationStatus'; import { makeGetOtherAccounts } from 'pl-fe/selectors'; import { useSettingsStore } from 'pl-fe/stores/settings'; import { useUiStore } from 'pl-fe/stores/ui'; diff --git a/packages/pl-fe/src/components/sidebar-navigation.tsx b/packages/pl-fe/src/components/sidebar-navigation.tsx index 7e7190f41..5a1a62e4e 100644 --- a/packages/pl-fe/src/components/sidebar-navigation.tsx +++ b/packages/pl-fe/src/components/sidebar-navigation.tsx @@ -7,7 +7,13 @@ import { useStatContext } from 'pl-fe/contexts/stat-context'; import Search from 'pl-fe/features/search/components/search'; import ComposeButton from 'pl-fe/features/ui/components/compose-button'; import ProfileDropdown from 'pl-fe/features/ui/components/profile-dropdown'; -import { useAppSelector, useFeatures, useOwnAccount, useSettings, useInstance, useRegistrationStatus, useLogo } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useRegistrationStatus } from 'pl-fe/hooks/useRegistrationStatus'; +import { useLogo } from 'pl-fe/hooks/useLogo'; import Account from './account'; import DropdownMenu, { Menu } from './dropdown-menu'; diff --git a/packages/pl-fe/src/components/site-error-boundary.tsx b/packages/pl-fe/src/components/site-error-boundary.tsx index c912134f3..3a76e3b40 100644 --- a/packages/pl-fe/src/components/site-error-boundary.tsx +++ b/packages/pl-fe/src/components/site-error-boundary.tsx @@ -7,7 +7,8 @@ import HStack from 'pl-fe/components/ui/hstack'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Textarea from 'pl-fe/components/ui/textarea'; -import { useLogo, usePlFeConfig } from 'pl-fe/hooks'; +import { useLogo } from 'pl-fe/hooks/useLogo'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { captureSentryException } from 'pl-fe/sentry'; import KVStore from 'pl-fe/storage/kv-store'; import sourceCode from 'pl-fe/utils/code'; diff --git a/packages/pl-fe/src/components/status-action-bar.tsx b/packages/pl-fe/src/components/status-action-bar.tsx index 44d8e33f1..eb0b27efc 100644 --- a/packages/pl-fe/src/components/status-action-bar.tsx +++ b/packages/pl-fe/src/components/status-action-bar.tsx @@ -24,7 +24,12 @@ import StatusActionButton from 'pl-fe/components/status-action-button'; import HStack from 'pl-fe/components/ui/hstack'; import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; import { languages } from 'pl-fe/features/preferences'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance, useOwnAccount, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { useChats } from 'pl-fe/queries/chats'; import { useModalsStore } from 'pl-fe/stores/modals'; import toast from 'pl-fe/toast'; diff --git a/packages/pl-fe/src/components/status-reactions-bar.tsx b/packages/pl-fe/src/components/status-reactions-bar.tsx index ee93b904e..032357b13 100644 --- a/packages/pl-fe/src/components/status-reactions-bar.tsx +++ b/packages/pl-fe/src/components/status-reactions-bar.tsx @@ -10,7 +10,10 @@ import Icon from 'pl-fe/components/ui/icon'; import Text from 'pl-fe/components/ui/text'; import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; import unicodeMapping from 'pl-fe/features/emoji/mapping'; -import { useAppDispatch, useFeatures, useLoggedIn, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { useModalsStore } from 'pl-fe/stores/modals'; import AnimatedNumber from './animated-number'; diff --git a/packages/pl-fe/src/components/thumb-navigation.tsx b/packages/pl-fe/src/components/thumb-navigation.tsx index 6369ccf42..adfca8316 100644 --- a/packages/pl-fe/src/components/thumb-navigation.tsx +++ b/packages/pl-fe/src/components/thumb-navigation.tsx @@ -7,7 +7,10 @@ import ThumbNavigationLink from 'pl-fe/components/thumb-navigation-link'; import Icon from 'pl-fe/components/ui/icon'; import { useStatContext } from 'pl-fe/contexts/stat-context'; import { Entities } from 'pl-fe/entity-store/entities'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { useModalsStore } from 'pl-fe/stores/modals'; import { useUiStore } from 'pl-fe/stores/ui'; import { isStandalone } from 'pl-fe/utils/state'; diff --git a/packages/pl-fe/src/components/translate-button.tsx b/packages/pl-fe/src/components/translate-button.tsx index a60bbf14a..88ce922f7 100644 --- a/packages/pl-fe/src/components/translate-button.tsx +++ b/packages/pl-fe/src/components/translate-button.tsx @@ -7,7 +7,11 @@ import HStack from 'pl-fe/components/ui/hstack'; import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import type { Status } from 'pl-fe/normalizers/status'; diff --git a/packages/pl-fe/src/features/about/index.tsx b/packages/pl-fe/src/features/about/index.tsx index dfd30be0a..6b030beb7 100644 --- a/packages/pl-fe/src/features/about/index.tsx +++ b/packages/pl-fe/src/features/about/index.tsx @@ -5,7 +5,9 @@ import { useParams } from 'react-router-dom'; import { fetchAboutPage } from 'pl-fe/actions/about'; import { Navlinks } from 'pl-fe/components/navlinks'; import Card from 'pl-fe/components/ui/card'; -import { usePlFeConfig, useSettings, useAppDispatch } from 'pl-fe/hooks'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; import { languages } from '../preferences'; diff --git a/packages/pl-fe/src/features/account-timeline/index.tsx b/packages/pl-fe/src/features/account-timeline/index.tsx index 8fd20d810..fda8a6f52 100644 --- a/packages/pl-fe/src/features/account-timeline/index.tsx +++ b/packages/pl-fe/src/features/account-timeline/index.tsx @@ -10,7 +10,10 @@ import StatusList from 'pl-fe/components/status-list'; import Card, { CardBody } from 'pl-fe/components/ui/card'; import Spinner from 'pl-fe/components/ui/spinner'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useAppSelector, useFeatures, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { makeGetStatusIds } from 'pl-fe/selectors'; const getStatusIds = makeGetStatusIds(); diff --git a/packages/pl-fe/src/features/account/components/header.tsx b/packages/pl-fe/src/features/account/components/header.tsx index 14ae6f0e3..8e54633af 100644 --- a/packages/pl-fe/src/features/account/components/header.tsx +++ b/packages/pl-fe/src/features/account/components/header.tsx @@ -22,7 +22,10 @@ import VerificationBadge from 'pl-fe/components/verification-badge'; import MovedNote from 'pl-fe/features/account-timeline/components/moved-note'; import ActionButton from 'pl-fe/features/ui/components/action-button'; import SubscriptionButton from 'pl-fe/features/ui/components/subscription-button'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { useChats } from 'pl-fe/queries/chats'; import { queryClient } from 'pl-fe/queries/client'; import { useModalsStore } from 'pl-fe/stores/modals'; diff --git a/packages/pl-fe/src/features/admin/tabs/dashboard.tsx b/packages/pl-fe/src/features/admin/tabs/dashboard.tsx index 1f7bfbfd2..d3ca91d6d 100644 --- a/packages/pl-fe/src/features/admin/tabs/dashboard.tsx +++ b/packages/pl-fe/src/features/admin/tabs/dashboard.tsx @@ -5,7 +5,9 @@ import List, { ListItem } from 'pl-fe/components/list'; import { CardTitle } from 'pl-fe/components/ui/card'; import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; -import { useOwnAccount, useFeatures, useInstance } from 'pl-fe/hooks'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import sourceCode from 'pl-fe/utils/code'; import { DashCounter, DashCounters } from '../components/dashcounter'; diff --git a/packages/pl-fe/src/features/aliases/index.tsx b/packages/pl-fe/src/features/aliases/index.tsx index f3568dac9..e54f15f1a 100644 --- a/packages/pl-fe/src/features/aliases/index.tsx +++ b/packages/pl-fe/src/features/aliases/index.tsx @@ -8,7 +8,10 @@ import { CardHeader, CardTitle } from 'pl-fe/components/ui/card'; import Column from 'pl-fe/components/ui/column'; import HStack from 'pl-fe/components/ui/hstack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import Account from './components/account'; import Search from './components/search'; diff --git a/packages/pl-fe/src/features/auth-login/components/password-reset.tsx b/packages/pl-fe/src/features/auth-login/components/password-reset.tsx index 36d3662bb..3545b8a98 100644 --- a/packages/pl-fe/src/features/auth-login/components/password-reset.tsx +++ b/packages/pl-fe/src/features/auth-login/components/password-reset.tsx @@ -9,7 +9,8 @@ import Form from 'pl-fe/components/ui/form'; import FormActions from 'pl-fe/components/ui/form-actions'; import FormGroup from 'pl-fe/components/ui/form-group'; import Input from 'pl-fe/components/ui/input'; -import { useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import toast from 'pl-fe/toast'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx index 93585ec31..3c6d837cd 100644 --- a/packages/pl-fe/src/features/auth-login/components/registration-form.tsx +++ b/packages/pl-fe/src/features/auth-login/components/registration-form.tsx @@ -16,7 +16,10 @@ import Input from 'pl-fe/components/ui/input'; import Select from 'pl-fe/components/ui/select'; import Textarea from 'pl-fe/components/ui/textarea'; import CaptchaField from 'pl-fe/features/auth-login/components/captcha'; -import { useAppDispatch, useSettings, useFeatures, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { useModalsStore } from 'pl-fe/stores/modals'; import type { CreateAccountParams } from 'pl-api'; diff --git a/packages/pl-fe/src/features/auth-login/components/registration-page.tsx b/packages/pl-fe/src/features/auth-login/components/registration-page.tsx index 5ea472123..8e21596b5 100644 --- a/packages/pl-fe/src/features/auth-login/components/registration-page.tsx +++ b/packages/pl-fe/src/features/auth-login/components/registration-page.tsx @@ -3,7 +3,8 @@ import { FormattedMessage } from 'react-intl'; import { BigCard } from 'pl-fe/components/big-card'; import Text from 'pl-fe/components/ui/text'; -import { useInstance, useRegistrationStatus } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useRegistrationStatus } from 'pl-fe/hooks/useRegistrationStatus'; import RegistrationForm from './registration-form'; diff --git a/packages/pl-fe/src/features/bookmarks/index.tsx b/packages/pl-fe/src/features/bookmarks/index.tsx index fa7017776..adfbdc46d 100644 --- a/packages/pl-fe/src/features/bookmarks/index.tsx +++ b/packages/pl-fe/src/features/bookmarks/index.tsx @@ -11,7 +11,9 @@ import DropdownMenu from 'pl-fe/components/dropdown-menu'; import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import StatusList from 'pl-fe/components/status-list'; import Column from 'pl-fe/components/ui/column'; -import { useAppSelector, useAppDispatch, useTheme } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import { useModalsStore } from 'pl-fe/stores/modals'; import toast from 'pl-fe/toast'; diff --git a/packages/pl-fe/src/features/bubble-timeline/index.tsx b/packages/pl-fe/src/features/bubble-timeline/index.tsx index 6e308801b..17a16a212 100644 --- a/packages/pl-fe/src/features/bubble-timeline/index.tsx +++ b/packages/pl-fe/src/features/bubble-timeline/index.tsx @@ -4,7 +4,9 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchBubbleTimeline } from 'pl-fe/actions/timelines'; import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useSettings, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import Timeline from '../ui/components/timeline'; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx index aaef11cac..e04327739 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx +++ b/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx @@ -12,7 +12,9 @@ import IconButton from 'pl-fe/components/ui/icon-button'; import Stack from 'pl-fe/components/ui/stack'; import Toggle from 'pl-fe/components/ui/toggle'; import SettingToggle from 'pl-fe/features/notifications/components/setting-toggle'; -import { useAppDispatch, useOwnAccount, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { useUpdateCredentials } from 'pl-fe/queries/accounts'; type FormData = { diff --git a/packages/pl-fe/src/features/circle/index.tsx b/packages/pl-fe/src/features/circle/index.tsx index e8d10dc66..b33e2955d 100644 --- a/packages/pl-fe/src/features/circle/index.tsx +++ b/packages/pl-fe/src/features/circle/index.tsx @@ -15,7 +15,8 @@ import HStack from 'pl-fe/components/ui/hstack'; import ProgressBar from 'pl-fe/components/ui/progress-bar'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { useModalsStore } from 'pl-fe/stores/modals'; const toRad = (x: number) => x * (Math.PI / 180); diff --git a/packages/pl-fe/src/features/community-timeline/index.tsx b/packages/pl-fe/src/features/community-timeline/index.tsx index e9e6f7baf..075e8463b 100644 --- a/packages/pl-fe/src/features/community-timeline/index.tsx +++ b/packages/pl-fe/src/features/community-timeline/index.tsx @@ -5,7 +5,9 @@ import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; import { useCommunityStream } from 'pl-fe/api/hooks/streaming/useCommunityStream'; import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useSettings, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import Timeline from '../ui/components/timeline'; diff --git a/packages/pl-fe/src/features/compose/components/compose-form.tsx b/packages/pl-fe/src/features/compose/components/compose-form.tsx index 4b09c7dd6..47ef8b847 100644 --- a/packages/pl-fe/src/features/compose/components/compose-form.tsx +++ b/packages/pl-fe/src/features/compose/components/compose-form.tsx @@ -17,7 +17,12 @@ import HStack from 'pl-fe/components/ui/hstack'; import Stack from 'pl-fe/components/ui/stack'; import EmojiPickerDropdown from 'pl-fe/features/emoji/containers/emoji-picker-dropdown-container'; import { ComposeEditor } from 'pl-fe/features/ui/util/async-components'; -import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles, useFeatures, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useDraggedFiles } from 'pl-fe/hooks/useDraggedFiles'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import QuotedStatusContainer from '../containers/quoted-status-container'; import ReplyIndicatorContainer from '../containers/reply-indicator-container'; diff --git a/packages/pl-fe/src/features/compose/components/content-type-button.tsx b/packages/pl-fe/src/features/compose/components/content-type-button.tsx index 2d935da0d..d23f62cf5 100644 --- a/packages/pl-fe/src/features/compose/components/content-type-button.tsx +++ b/packages/pl-fe/src/features/compose/components/content-type-button.tsx @@ -4,7 +4,9 @@ import { defineMessages, useIntl } from 'react-intl'; import { changeComposeContentType } from 'pl-fe/actions/compose'; import DropdownMenu from 'pl-fe/components/dropdown-menu'; import Button from 'pl-fe/components/ui/button'; -import { useAppDispatch, useCompose, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useInstance } from 'pl-fe/hooks/useInstance'; const messages = defineMessages({ content_type_plaintext: { id: 'preferences.options.content_type_plaintext', defaultMessage: 'Plain text' }, diff --git a/packages/pl-fe/src/features/compose/components/language-dropdown.tsx b/packages/pl-fe/src/features/compose/components/language-dropdown.tsx index 1380ae8ee..5a90a916e 100644 --- a/packages/pl-fe/src/features/compose/components/language-dropdown.tsx +++ b/packages/pl-fe/src/features/compose/components/language-dropdown.tsx @@ -9,7 +9,10 @@ import Button from 'pl-fe/components/ui/button'; import Icon from 'pl-fe/components/ui/icon'; import Input from 'pl-fe/components/ui/input'; import { type Language, languages as languagesObject } from 'pl-fe/features/preferences'; -import { useAppDispatch, useCompose, useFeatures, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useSettings } from 'pl-fe/hooks/useSettings'; const getFrequentlyUsedLanguages = (languageCounters: Record) => ( Object.keys(languageCounters) diff --git a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx index 695667dd3..cee17617b 100644 --- a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx +++ b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx @@ -9,7 +9,9 @@ import HStack from 'pl-fe/components/ui/hstack'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch, useCompose, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import DurationSelector from './duration-selector'; diff --git a/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx b/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx index b16323ffe..9c2b89c26 100644 --- a/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx +++ b/packages/pl-fe/src/features/compose/components/privacy-dropdown.tsx @@ -6,7 +6,10 @@ import { fetchLists } from 'pl-fe/actions/lists'; import DropdownMenu, { MenuItem } from 'pl-fe/components/dropdown-menu'; import Button from 'pl-fe/components/ui/button'; import { getOrderedLists } from 'pl-fe/features/lists'; -import { useAppDispatch, useAppSelector, useCompose, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import type { Features } from 'pl-api'; diff --git a/packages/pl-fe/src/features/compose/components/reply-mentions.tsx b/packages/pl-fe/src/features/compose/components/reply-mentions.tsx index 7187096c7..a2be8170a 100644 --- a/packages/pl-fe/src/features/compose/components/reply-mentions.tsx +++ b/packages/pl-fe/src/features/compose/components/reply-mentions.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { FormattedList, FormattedMessage } from 'react-intl'; -import { useCompose, useFeatures } from 'pl-fe/hooks'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { useModalsStore } from 'pl-fe/stores/modals'; interface IReplyMentions { diff --git a/packages/pl-fe/src/features/compose/components/upload.tsx b/packages/pl-fe/src/features/compose/components/upload.tsx index 8d67541f9..f00afb2b8 100644 --- a/packages/pl-fe/src/features/compose/components/upload.tsx +++ b/packages/pl-fe/src/features/compose/components/upload.tsx @@ -2,7 +2,9 @@ import React, { useCallback } from 'react'; import { undoUploadCompose, changeUploadCompose } from 'pl-fe/actions/compose'; import Upload from 'pl-fe/components/upload'; -import { useAppDispatch, useCompose, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useInstance } from 'pl-fe/hooks/useInstance'; interface IUploadCompose { id: string; diff --git a/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx b/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx index 1d76d6442..3dfca8165 100644 --- a/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/reply-indicator-container.tsx @@ -1,7 +1,9 @@ import React, { useCallback } from 'react'; import { cancelReplyCompose } from 'pl-fe/actions/compose'; -import { useAppDispatch, useAppSelector, useCompose } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useCompose } from 'pl-fe/hooks/useCompose'; import { makeGetStatus } from 'pl-fe/selectors'; import ReplyIndicator from '../components/reply-indicator'; diff --git a/packages/pl-fe/src/features/compose/containers/warning-container.tsx b/packages/pl-fe/src/features/compose/containers/warning-container.tsx index a302af492..af377b3d3 100644 --- a/packages/pl-fe/src/features/compose/containers/warning-container.tsx +++ b/packages/pl-fe/src/features/compose/containers/warning-container.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; -import { useAppSelector, useCompose } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useCompose } from 'pl-fe/hooks/useCompose'; import { selectOwnAccount } from 'pl-fe/selectors'; import Warning from '../components/warning'; diff --git a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx index a57629969..170249e96 100644 --- a/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx +++ b/packages/pl-fe/src/features/compose/editor/plugins/state-plugin.tsx @@ -7,7 +7,8 @@ import { useIntl } from 'react-intl'; import { addSuggestedLanguage, addSuggestedQuote, setEditorState } from 'pl-fe/actions/compose'; import { fetchStatus } from 'pl-fe/actions/statuses'; -import { useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { getStatusIdsFromLinksInContent } from 'pl-fe/utils/status'; import type { LanguageIdentificationModel } from 'fasttext.wasm.js/dist/models/language-identification/common.js'; diff --git a/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx b/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx index d11898c8a..4ea44ae42 100644 --- a/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx +++ b/packages/pl-fe/src/features/crypto-donate/components/crypto-donate-panel.tsx @@ -4,7 +4,8 @@ import { useHistory } from 'react-router-dom'; import Text from 'pl-fe/components/ui/text'; import Widget from 'pl-fe/components/ui/widget'; -import { useInstance, usePlFeConfig } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import SiteWallet from './site-wallet'; diff --git a/packages/pl-fe/src/features/delete-account/index.tsx b/packages/pl-fe/src/features/delete-account/index.tsx index 3c6c511e1..218e7ff50 100644 --- a/packages/pl-fe/src/features/delete-account/index.tsx +++ b/packages/pl-fe/src/features/delete-account/index.tsx @@ -10,7 +10,8 @@ import FormGroup from 'pl-fe/components/ui/form-group'; import Input from 'pl-fe/components/ui/input'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import toast from 'pl-fe/toast'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/developers/apps/create.tsx b/packages/pl-fe/src/features/developers/apps/create.tsx index 81ae5081e..c21d65505 100644 --- a/packages/pl-fe/src/features/developers/apps/create.tsx +++ b/packages/pl-fe/src/features/developers/apps/create.tsx @@ -12,7 +12,8 @@ import Input from 'pl-fe/components/ui/input'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Textarea from 'pl-fe/components/ui/textarea'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { getBaseURL } from 'pl-fe/utils/accounts'; import type { Token } from 'pl-api'; diff --git a/packages/pl-fe/src/features/directory/index.tsx b/packages/pl-fe/src/features/directory/index.tsx index e031311f7..087640a01 100644 --- a/packages/pl-fe/src/features/directory/index.tsx +++ b/packages/pl-fe/src/features/directory/index.tsx @@ -9,7 +9,10 @@ import { RadioGroup, RadioItem } from 'pl-fe/components/radio'; import { CardTitle } from 'pl-fe/components/ui/card'; import Column from 'pl-fe/components/ui/column'; import Stack from 'pl-fe/components/ui/stack'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import AccountCard from './components/account-card'; diff --git a/packages/pl-fe/src/features/edit-profile/index.tsx b/packages/pl-fe/src/features/edit-profile/index.tsx index 2f9fce596..3ab63eb59 100644 --- a/packages/pl-fe/src/features/edit-profile/index.tsx +++ b/packages/pl-fe/src/features/edit-profile/index.tsx @@ -17,7 +17,11 @@ import Input from 'pl-fe/components/ui/input'; import Streamfield from 'pl-fe/components/ui/streamfield'; import Textarea from 'pl-fe/components/ui/textarea'; import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch, useOwnAccount, useFeatures, useInstance, useAppSelector } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; import { useImageField } from 'pl-fe/hooks/forms/useImageField'; import toast from 'pl-fe/toast'; import { isDefaultAvatar, isDefaultHeader } from 'pl-fe/utils/accounts'; diff --git a/packages/pl-fe/src/features/embedded-status/index.tsx b/packages/pl-fe/src/features/embedded-status/index.tsx index a18f75b1f..914d7cc60 100644 --- a/packages/pl-fe/src/features/embedded-status/index.tsx +++ b/packages/pl-fe/src/features/embedded-status/index.tsx @@ -7,7 +7,9 @@ import MissingIndicator from 'pl-fe/components/missing-indicator'; import SiteLogo from 'pl-fe/components/site-logo'; import Status from 'pl-fe/components/status'; import Spinner from 'pl-fe/components/ui/spinner'; -import { useAppDispatch, useAppSelector, useLogo } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useLogo } from 'pl-fe/hooks/useLogo'; import { iframeId } from 'pl-fe/iframe'; import { makeGetStatus } from 'pl-fe/selectors'; diff --git a/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx b/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx index cd9f59068..9dd143ae0 100644 --- a/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx +++ b/packages/pl-fe/src/features/emoji/components/emoji-picker-dropdown.tsx @@ -4,7 +4,10 @@ import { createSelector } from 'reselect'; import { chooseEmoji } from 'pl-fe/actions/emojis'; import { changeSetting } from 'pl-fe/actions/settings'; -import { useAppDispatch, useAppSelector, useSettings, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { RootState } from 'pl-fe/store'; import { buildCustomEmojis } from '../../emoji'; diff --git a/packages/pl-fe/src/features/event/components/event-header.tsx b/packages/pl-fe/src/features/event/components/event-header.tsx index 7dcaea35e..a1bc20ba8 100644 --- a/packages/pl-fe/src/features/event/components/event-header.tsx +++ b/packages/pl-fe/src/features/event/components/event-header.tsx @@ -19,7 +19,10 @@ import IconButton from 'pl-fe/components/ui/icon-button'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import VerificationBadge from 'pl-fe/components/verification-badge'; -import { useAppDispatch, useFeatures, useOwnAccount, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { useChats } from 'pl-fe/queries/chats'; import { useModalsStore } from 'pl-fe/stores/modals'; import copy from 'pl-fe/utils/copy'; diff --git a/packages/pl-fe/src/features/event/event-information.tsx b/packages/pl-fe/src/features/event/event-information.tsx index 80d5b51c8..f71f26392 100644 --- a/packages/pl-fe/src/features/event/event-information.tsx +++ b/packages/pl-fe/src/features/event/event-information.tsx @@ -11,7 +11,9 @@ import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import QuotedStatus from 'pl-fe/features/status/containers/quoted-status-container'; -import { useAppDispatch, useAppSelector, usePlFeConfig } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { makeGetStatus } from 'pl-fe/selectors'; import { useModalsStore } from 'pl-fe/stores/modals'; diff --git a/packages/pl-fe/src/features/favourited-statuses/index.tsx b/packages/pl-fe/src/features/favourited-statuses/index.tsx index 6f2902cfc..ca18af7cf 100644 --- a/packages/pl-fe/src/features/favourited-statuses/index.tsx +++ b/packages/pl-fe/src/features/favourited-statuses/index.tsx @@ -9,7 +9,9 @@ import { useAccountLookup } from 'pl-fe/api/hooks/accounts/useAccountLookup'; import MissingIndicator from 'pl-fe/components/missing-indicator'; import StatusList from 'pl-fe/components/status-list'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useAppSelector, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; const messages = defineMessages({ heading: { id: 'column.favourited_statuses', defaultMessage: 'Liked posts' }, diff --git a/packages/pl-fe/src/features/federation-restrictions/index.tsx b/packages/pl-fe/src/features/federation-restrictions/index.tsx index cadac9635..1f827d840 100644 --- a/packages/pl-fe/src/features/federation-restrictions/index.tsx +++ b/packages/pl-fe/src/features/federation-restrictions/index.tsx @@ -4,7 +4,8 @@ import { defineMessages, useIntl } from 'react-intl'; import ScrollableList from 'pl-fe/components/scrollable-list'; import Accordion from 'pl-fe/components/ui/accordion'; import Column from 'pl-fe/components/ui/column'; -import { useAppSelector, useInstance } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { makeGetHosts } from 'pl-fe/selectors'; import { federationRestrictionsDisclosed } from 'pl-fe/utils/state'; diff --git a/packages/pl-fe/src/features/filters/edit-filter.tsx b/packages/pl-fe/src/features/filters/edit-filter.tsx index 28aafe2a6..113621db0 100644 --- a/packages/pl-fe/src/features/filters/edit-filter.tsx +++ b/packages/pl-fe/src/features/filters/edit-filter.tsx @@ -16,7 +16,8 @@ import Stack from 'pl-fe/components/ui/stack'; import Streamfield from 'pl-fe/components/ui/streamfield'; import Text from 'pl-fe/components/ui/text'; import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import toast from 'pl-fe/toast'; import { SelectDropdown } from '../forms'; diff --git a/packages/pl-fe/src/features/group/group-timeline.tsx b/packages/pl-fe/src/features/group/group-timeline.tsx index fdd5fdeeb..2afb3f668 100644 --- a/packages/pl-fe/src/features/group/group-timeline.tsx +++ b/packages/pl-fe/src/features/group/group-timeline.tsx @@ -13,7 +13,10 @@ import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import ComposeForm from 'pl-fe/features/compose/components/compose-form'; -import { useAppDispatch, useAppSelector, useDraggedFiles, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useDraggedFiles } from 'pl-fe/hooks/useDraggedFiles'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { makeGetStatusIds } from 'pl-fe/selectors'; import Timeline from '../ui/components/timeline'; diff --git a/packages/pl-fe/src/features/hashtag-timeline/index.tsx b/packages/pl-fe/src/features/hashtag-timeline/index.tsx index 6f2f4bae2..d7fde18b0 100644 --- a/packages/pl-fe/src/features/hashtag-timeline/index.tsx +++ b/packages/pl-fe/src/features/hashtag-timeline/index.tsx @@ -8,7 +8,11 @@ import List, { ListItem } from 'pl-fe/components/list'; import Column from 'pl-fe/components/ui/column'; import Toggle from 'pl-fe/components/ui/toggle'; import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch, useAppSelector, useFeatures, useLoggedIn, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; interface IHashtagTimeline { diff --git a/packages/pl-fe/src/features/home-timeline/index.tsx b/packages/pl-fe/src/features/home-timeline/index.tsx index 4654f15ac..9400f68e4 100644 --- a/packages/pl-fe/src/features/home-timeline/index.tsx +++ b/packages/pl-fe/src/features/home-timeline/index.tsx @@ -8,7 +8,11 @@ import Column from 'pl-fe/components/ui/column'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppSelector, useAppDispatch, useFeatures, useInstance, useTheme } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/landing-timeline/index.tsx b/packages/pl-fe/src/features/landing-timeline/index.tsx index 070c6f52b..f1972cd13 100644 --- a/packages/pl-fe/src/features/landing-timeline/index.tsx +++ b/packages/pl-fe/src/features/landing-timeline/index.tsx @@ -5,7 +5,9 @@ import { fetchPublicTimeline } from 'pl-fe/actions/timelines'; import { useCommunityStream } from 'pl-fe/api/hooks/streaming/useCommunityStream'; import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useInstance, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import AboutPage from '../about'; diff --git a/packages/pl-fe/src/features/list-timeline/index.tsx b/packages/pl-fe/src/features/list-timeline/index.tsx index 27f4de293..5aacead18 100644 --- a/packages/pl-fe/src/features/list-timeline/index.tsx +++ b/packages/pl-fe/src/features/list-timeline/index.tsx @@ -10,7 +10,9 @@ import MissingIndicator from 'pl-fe/components/missing-indicator'; import Button from 'pl-fe/components/ui/button'; import Column from 'pl-fe/components/ui/column'; import Spinner from 'pl-fe/components/ui/spinner'; -import { useAppDispatch, useAppSelector, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import { useModalsStore } from 'pl-fe/stores/modals'; diff --git a/packages/pl-fe/src/features/notifications/components/filter-bar.tsx b/packages/pl-fe/src/features/notifications/components/filter-bar.tsx index 870e7128c..77680bb52 100644 --- a/packages/pl-fe/src/features/notifications/components/filter-bar.tsx +++ b/packages/pl-fe/src/features/notifications/components/filter-bar.tsx @@ -4,7 +4,9 @@ import { defineMessages, useIntl } from 'react-intl'; import { type FilterType, setFilter } from 'pl-fe/actions/notifications'; import Icon from 'pl-fe/components/ui/icon'; import Tabs from 'pl-fe/components/ui/tabs'; -import { useAppDispatch, useFeatures, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import type { Item } from 'pl-fe/components/ui/tabs'; diff --git a/packages/pl-fe/src/features/notifications/components/notification.tsx b/packages/pl-fe/src/features/notifications/components/notification.tsx index bc5351f12..2c2fc8f17 100644 --- a/packages/pl-fe/src/features/notifications/components/notification.tsx +++ b/packages/pl-fe/src/features/notifications/components/notification.tsx @@ -14,7 +14,10 @@ import Text from 'pl-fe/components/ui/text'; import AccountContainer from 'pl-fe/containers/account-container'; import StatusContainer from 'pl-fe/containers/status-container'; import { HotKeys } from 'pl-fe/features/ui/components/hotkeys'; -import { useAppDispatch, useAppSelector, useInstance, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import { makeGetNotification } from 'pl-fe/selectors'; import { useModalsStore } from 'pl-fe/stores/modals'; import { useSettingsStore } from 'pl-fe/stores/settings'; diff --git a/packages/pl-fe/src/features/onboarding/onboarding-wizard.tsx b/packages/pl-fe/src/features/onboarding/onboarding-wizard.tsx index 8421cb20f..1a2880a62 100644 --- a/packages/pl-fe/src/features/onboarding/onboarding-wizard.tsx +++ b/packages/pl-fe/src/features/onboarding/onboarding-wizard.tsx @@ -5,7 +5,8 @@ import ReactSwipeableViews from 'react-swipeable-views'; import { endOnboarding } from 'pl-fe/actions/onboarding'; import LandingGradient from 'pl-fe/components/landing-gradient'; import HStack from 'pl-fe/components/ui/hstack'; -import { useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import AvatarSelectionStep from './steps/avatar-selection-step'; import BioStep from './steps/bio-step'; diff --git a/packages/pl-fe/src/features/onboarding/steps/avatar-selection-step.tsx b/packages/pl-fe/src/features/onboarding/steps/avatar-selection-step.tsx index 09461b78c..8ebd72704 100644 --- a/packages/pl-fe/src/features/onboarding/steps/avatar-selection-step.tsx +++ b/packages/pl-fe/src/features/onboarding/steps/avatar-selection-step.tsx @@ -9,7 +9,8 @@ import Button from 'pl-fe/components/ui/button'; import Icon from 'pl-fe/components/ui/icon'; import Spinner from 'pl-fe/components/ui/spinner'; import Stack from 'pl-fe/components/ui/stack'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import toast from 'pl-fe/toast'; import { isDefaultAvatar } from 'pl-fe/utils/accounts'; import resizeImage from 'pl-fe/utils/resize-image'; diff --git a/packages/pl-fe/src/features/onboarding/steps/bio-step.tsx b/packages/pl-fe/src/features/onboarding/steps/bio-step.tsx index 3b216e51f..a2abcc71a 100644 --- a/packages/pl-fe/src/features/onboarding/steps/bio-step.tsx +++ b/packages/pl-fe/src/features/onboarding/steps/bio-step.tsx @@ -7,7 +7,8 @@ import Button from 'pl-fe/components/ui/button'; import FormGroup from 'pl-fe/components/ui/form-group'; import Stack from 'pl-fe/components/ui/stack'; import Textarea from 'pl-fe/components/ui/textarea'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import toast from 'pl-fe/toast'; import type { PlfeResponse } from 'pl-fe/api'; diff --git a/packages/pl-fe/src/features/onboarding/steps/cover-photo-selection-step.tsx b/packages/pl-fe/src/features/onboarding/steps/cover-photo-selection-step.tsx index eadd306c5..ca5bbf327 100644 --- a/packages/pl-fe/src/features/onboarding/steps/cover-photo-selection-step.tsx +++ b/packages/pl-fe/src/features/onboarding/steps/cover-photo-selection-step.tsx @@ -11,7 +11,8 @@ import Icon from 'pl-fe/components/ui/icon'; import Spinner from 'pl-fe/components/ui/spinner'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import toast from 'pl-fe/toast'; import { isDefaultHeader } from 'pl-fe/utils/accounts'; import resizeImage from 'pl-fe/utils/resize-image'; diff --git a/packages/pl-fe/src/features/onboarding/steps/display-name-step.tsx b/packages/pl-fe/src/features/onboarding/steps/display-name-step.tsx index cbb4d9f23..d94dae60d 100644 --- a/packages/pl-fe/src/features/onboarding/steps/display-name-step.tsx +++ b/packages/pl-fe/src/features/onboarding/steps/display-name-step.tsx @@ -7,7 +7,8 @@ import Button from 'pl-fe/components/ui/button'; import FormGroup from 'pl-fe/components/ui/form-group'; import Input from 'pl-fe/components/ui/input'; import Stack from 'pl-fe/components/ui/stack'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import toast from 'pl-fe/toast'; import type { PlfeResponse } from 'pl-fe/api'; diff --git a/packages/pl-fe/src/features/onboarding/steps/fediverse-step.tsx b/packages/pl-fe/src/features/onboarding/steps/fediverse-step.tsx index c44aed2c7..a278e2b20 100644 --- a/packages/pl-fe/src/features/onboarding/steps/fediverse-step.tsx +++ b/packages/pl-fe/src/features/onboarding/steps/fediverse-step.tsx @@ -7,7 +7,8 @@ import Card, { CardBody } from 'pl-fe/components/ui/card'; import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useInstance, useOwnAccount } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; const FediverseStep = ({ onNext }: { onNext: () => void }) => { const { account } = useOwnAccount(); diff --git a/packages/pl-fe/src/features/pl-fe-config/index.tsx b/packages/pl-fe/src/features/pl-fe-config/index.tsx index 232078309..689519956 100644 --- a/packages/pl-fe/src/features/pl-fe-config/index.tsx +++ b/packages/pl-fe/src/features/pl-fe-config/index.tsx @@ -18,7 +18,9 @@ import Streamfield from 'pl-fe/components/ui/streamfield'; import Textarea from 'pl-fe/components/ui/textarea'; import Toggle from 'pl-fe/components/ui/toggle'; import ThemeSelector from 'pl-fe/features/ui/components/theme-selector'; -import { useAppSelector, useAppDispatch, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { normalizePlFeConfig } from 'pl-fe/normalizers'; import toast from 'pl-fe/toast'; diff --git a/packages/pl-fe/src/features/preferences/index.tsx b/packages/pl-fe/src/features/preferences/index.tsx index 155b852e1..a55057a30 100644 --- a/packages/pl-fe/src/features/preferences/index.tsx +++ b/packages/pl-fe/src/features/preferences/index.tsx @@ -7,7 +7,9 @@ import List, { ListItem } from 'pl-fe/components/list'; import Form from 'pl-fe/components/ui/form'; import { Mutliselect, SelectDropdown } from 'pl-fe/features/forms'; import SettingToggle from 'pl-fe/features/notifications/components/setting-toggle'; -import { useAppDispatch, useFeatures, useSettings } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import ThemeToggle from '../ui/components/theme-toggle'; diff --git a/packages/pl-fe/src/features/public-timeline/index.tsx b/packages/pl-fe/src/features/public-timeline/index.tsx index 32e9ffd8c..98b601e09 100644 --- a/packages/pl-fe/src/features/public-timeline/index.tsx +++ b/packages/pl-fe/src/features/public-timeline/index.tsx @@ -8,7 +8,10 @@ import { usePublicStream } from 'pl-fe/api/hooks/streaming/usePublicStream'; import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import Accordion from 'pl-fe/components/ui/accordion'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useInstance, useSettings, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import PinnedHostsPicker from '../remote-timeline/components/pinned-hosts-picker'; diff --git a/packages/pl-fe/src/features/quotes/index.tsx b/packages/pl-fe/src/features/quotes/index.tsx index 3a8803122..687814a21 100644 --- a/packages/pl-fe/src/features/quotes/index.tsx +++ b/packages/pl-fe/src/features/quotes/index.tsx @@ -7,7 +7,9 @@ import { useParams } from 'react-router-dom'; import { expandStatusQuotes, fetchStatusQuotes } from 'pl-fe/actions/status-quotes'; import StatusList from 'pl-fe/components/status-list'; import Column from 'pl-fe/components/ui/column'; -import { useAppDispatch, useAppSelector, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/remote-timeline/index.tsx b/packages/pl-fe/src/features/remote-timeline/index.tsx index 52fcf4240..f460fcbeb 100644 --- a/packages/pl-fe/src/features/remote-timeline/index.tsx +++ b/packages/pl-fe/src/features/remote-timeline/index.tsx @@ -8,7 +8,9 @@ import IconButton from 'pl-fe/components/icon-button'; import Column from 'pl-fe/components/ui/column'; import HStack from 'pl-fe/components/ui/hstack'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useSettings, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; import Timeline from '../ui/components/timeline'; diff --git a/packages/pl-fe/src/features/settings/index.tsx b/packages/pl-fe/src/features/settings/index.tsx index 52c2ee7d0..20c1eba58 100644 --- a/packages/pl-fe/src/features/settings/index.tsx +++ b/packages/pl-fe/src/features/settings/index.tsx @@ -6,7 +6,10 @@ import List, { ListItem } from 'pl-fe/components/list'; import Card, { CardBody, CardHeader, CardTitle } from 'pl-fe/components/ui/card'; import Column from 'pl-fe/components/ui/column'; import Text from 'pl-fe/components/ui/text'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import Preferences from '../preferences'; diff --git a/packages/pl-fe/src/features/status/components/thread-login-cta.tsx b/packages/pl-fe/src/features/status/components/thread-login-cta.tsx index 9ceeb84f2..79c5c63b4 100644 --- a/packages/pl-fe/src/features/status/components/thread-login-cta.tsx +++ b/packages/pl-fe/src/features/status/components/thread-login-cta.tsx @@ -5,7 +5,8 @@ import Button from 'pl-fe/components/ui/button'; import Card, { CardTitle } from 'pl-fe/components/ui/card'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useInstance, usePlFeConfig } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; /** Prompts logged-out users to log in when viewing a thread. */ const ThreadLoginCta: React.FC = () => { diff --git a/packages/pl-fe/src/features/status/index.tsx b/packages/pl-fe/src/features/status/index.tsx index b9117a95b..edbed0f61 100644 --- a/packages/pl-fe/src/features/status/index.tsx +++ b/packages/pl-fe/src/features/status/index.tsx @@ -8,7 +8,9 @@ import PullToRefresh from 'pl-fe/components/pull-to-refresh'; import Column from 'pl-fe/components/ui/column'; import Stack from 'pl-fe/components/ui/stack'; import PlaceholderStatus from 'pl-fe/features/placeholder/components/placeholder-status'; -import { useAppDispatch, useAppSelector, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import { makeGetStatus } from 'pl-fe/selectors'; import Thread from './components/thread'; diff --git a/packages/pl-fe/src/features/test-timeline/index.tsx b/packages/pl-fe/src/features/test-timeline/index.tsx index e8e256a70..d7f47db3a 100644 --- a/packages/pl-fe/src/features/test-timeline/index.tsx +++ b/packages/pl-fe/src/features/test-timeline/index.tsx @@ -5,7 +5,8 @@ import { importFetchedStatuses } from 'pl-fe/actions/importer'; import { expandTimelineSuccess } from 'pl-fe/actions/timelines'; import Column from 'pl-fe/components/ui/column'; import Timeline from 'pl-fe/features/ui/components/timeline'; -import { useAppDispatch, useTheme } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; const messages = defineMessages({ diff --git a/packages/pl-fe/src/features/theme-editor/index.tsx b/packages/pl-fe/src/features/theme-editor/index.tsx index e26bcf0be..11c480fb1 100644 --- a/packages/pl-fe/src/features/theme-editor/index.tsx +++ b/packages/pl-fe/src/features/theme-editor/index.tsx @@ -11,7 +11,9 @@ import Column from 'pl-fe/components/ui/column'; import Form from 'pl-fe/components/ui/form'; import FormActions from 'pl-fe/components/ui/form-actions'; import ColorPicker from 'pl-fe/features/pl-fe-config/components/color-picker'; -import { useAppDispatch, useAppSelector, usePlFeConfig } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { normalizePlFeConfig } from 'pl-fe/normalizers'; import toast from 'pl-fe/toast'; import { download } from 'pl-fe/utils/download'; diff --git a/packages/pl-fe/src/features/ui/components/action-button.tsx b/packages/pl-fe/src/features/ui/components/action-button.tsx index 5e58e1a2e..206c46828 100644 --- a/packages/pl-fe/src/features/ui/components/action-button.tsx +++ b/packages/pl-fe/src/features/ui/components/action-button.tsx @@ -13,7 +13,9 @@ import { import { useFollow } from 'pl-fe/api/hooks/accounts/useFollow'; import Button from 'pl-fe/components/ui/button'; import HStack from 'pl-fe/components/ui/hstack'; -import { useAppDispatch, useFeatures, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import { useModalsStore } from 'pl-fe/stores/modals'; import toast from 'pl-fe/toast'; diff --git a/packages/pl-fe/src/features/ui/components/modals/account-moderation-modal/index.tsx b/packages/pl-fe/src/features/ui/components/modals/account-moderation-modal/index.tsx index e3319f071..13a33ea0d 100644 --- a/packages/pl-fe/src/features/ui/components/modals/account-moderation-modal/index.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/account-moderation-modal/index.tsx @@ -17,7 +17,9 @@ import Modal from 'pl-fe/components/ui/modal'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Toggle from 'pl-fe/components/ui/toggle'; -import { useAppDispatch, useFeatures, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import toast from 'pl-fe/toast'; import { getBadges } from 'pl-fe/utils/badges'; diff --git a/packages/pl-fe/src/features/ui/components/modals/compose-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/compose-modal.tsx index ae5ccb45c..6248b4bb5 100644 --- a/packages/pl-fe/src/features/ui/components/modals/compose-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/compose-modal.tsx @@ -6,7 +6,9 @@ import { cancelReplyCompose, uploadCompose } from 'pl-fe/actions/compose'; import { saveDraftStatus } from 'pl-fe/actions/draft-statuses'; import { checkComposeContent } from 'pl-fe/components/modal-root'; import Modal from 'pl-fe/components/ui/modal'; -import { useAppDispatch, useCompose, useDraggedFiles } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useDraggedFiles } from 'pl-fe/hooks/useDraggedFiles'; import { useModalsStore } from 'pl-fe/stores/modals'; import ComposeForm from '../../../compose/components/compose-form'; diff --git a/packages/pl-fe/src/features/ui/components/modals/event-map-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/event-map-modal.tsx index 96e76c08e..f7fe31237 100644 --- a/packages/pl-fe/src/features/ui/components/modals/event-map-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/event-map-modal.tsx @@ -5,7 +5,8 @@ import { FormattedMessage } from 'react-intl'; import Button from 'pl-fe/components/ui/button'; import Modal from 'pl-fe/components/ui/modal'; import Stack from 'pl-fe/components/ui/stack'; -import { useAppSelector, usePlFeConfig } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { makeGetStatus } from 'pl-fe/selectors'; import 'leaflet/dist/leaflet.css'; diff --git a/packages/pl-fe/src/features/ui/components/modals/hotkeys-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/hotkeys-modal.tsx index cb8f1507b..d1a9d673d 100644 --- a/packages/pl-fe/src/features/ui/components/modals/hotkeys-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/hotkeys-modal.tsx @@ -3,7 +3,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import Modal from 'pl-fe/components/ui/modal'; -import { useFeatures, useLoggedIn } from 'pl-fe/hooks'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import type { BaseModalProps } from '../modal-root'; diff --git a/packages/pl-fe/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/packages/pl-fe/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx index 76168a8e6..0ff9f2899 100644 --- a/packages/pl-fe/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx @@ -7,7 +7,8 @@ import Input from 'pl-fe/components/ui/input'; import Textarea from 'pl-fe/components/ui/textarea'; import AvatarPicker from 'pl-fe/features/edit-profile/components/avatar-picker'; import HeaderPicker from 'pl-fe/features/edit-profile/components/header-picker'; -import { useAppSelector, useInstance } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import { usePreview } from 'pl-fe/hooks/forms/usePreview'; import resizeImage from 'pl-fe/utils/resize-image'; diff --git a/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx index 6804af0c8..d6d54751c 100644 --- a/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/reply-mentions-modal.tsx @@ -3,7 +3,9 @@ import { FormattedMessage } from 'react-intl'; import Modal from 'pl-fe/components/ui/modal'; import Account from 'pl-fe/features/reply-mentions/account'; -import { useAppSelector, useCompose, useOwnAccount } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useCompose } from 'pl-fe/hooks/useCompose'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { statusToMentionsAccountIdsArray } from 'pl-fe/reducers/compose'; import { makeGetStatus } from 'pl-fe/selectors'; diff --git a/packages/pl-fe/src/features/ui/components/modals/report-modal/index.tsx b/packages/pl-fe/src/features/ui/components/modals/report-modal/index.tsx index 8a73c7a3c..5c94dda63 100644 --- a/packages/pl-fe/src/features/ui/components/modals/report-modal/index.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/report-modal/index.tsx @@ -12,7 +12,9 @@ import ProgressBar from 'pl-fe/components/ui/progress-bar'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import AccountContainer from 'pl-fe/containers/account-container'; -import { useAppDispatch, useAppSelector, useInstance } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; import ConfirmationStep from './steps/confirmation-step'; import OtherActionsStep from './steps/other-actions-step'; diff --git a/packages/pl-fe/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/packages/pl-fe/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index a791c8e31..0b425b891 100644 --- a/packages/pl-fe/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -9,7 +9,8 @@ import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import Toggle from 'pl-fe/components/ui/toggle'; import StatusCheckBox from 'pl-fe/features/ui/components/modals/report-modal/components/status-check-box'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { getDomain } from 'pl-fe/utils/accounts'; import type { Account } from 'pl-fe/normalizers/account'; diff --git a/packages/pl-fe/src/features/ui/components/modals/unauthorized-modal.tsx b/packages/pl-fe/src/features/ui/components/modals/unauthorized-modal.tsx index 65ba6eaf7..4f3a09ba9 100644 --- a/packages/pl-fe/src/features/ui/components/modals/unauthorized-modal.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/unauthorized-modal.tsx @@ -9,7 +9,11 @@ import Input from 'pl-fe/components/ui/input'; import Modal from 'pl-fe/components/ui/modal'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppSelector, useAppDispatch, useFeatures, useInstance, useRegistrationStatus } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useRegistrationStatus } from 'pl-fe/hooks/useRegistrationStatus'; import { selectAccount } from 'pl-fe/selectors'; import toast from 'pl-fe/toast'; diff --git a/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx index 48ae3a635..beb270f57 100644 --- a/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/instance-info-panel.tsx @@ -3,7 +3,9 @@ import { useIntl, defineMessages } from 'react-intl'; import { pinHost, unpinHost } from 'pl-fe/actions/remote-timeline'; import Widget from 'pl-fe/components/ui/widget'; -import { useAppSelector, useAppDispatch, useSettings } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { makeGetRemoteInstance } from 'pl-fe/selectors'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx index ef119a0a6..1713c19af 100644 --- a/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/instance-moderation-panel.tsx @@ -4,7 +4,8 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import DropdownMenu from 'pl-fe/components/dropdown-menu'; import Widget from 'pl-fe/components/ui/widget'; import InstanceRestrictions from 'pl-fe/features/federation-restrictions/components/instance-restrictions'; -import { useAppSelector, useOwnAccount } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { makeGetRemoteInstance } from 'pl-fe/selectors'; import { useModalsStore } from 'pl-fe/stores/modals'; diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx index 0903be049..8ffc01e9d 100644 --- a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx @@ -10,7 +10,8 @@ import HStack from 'pl-fe/components/ui/hstack'; import Icon from 'pl-fe/components/ui/icon'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; -import { useAppSelector, usePlFeConfig } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { capitalize } from 'pl-fe/utils/strings'; import ProfileFamiliarFollowers from '../profile-familiar-followers'; diff --git a/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx index eeaafd656..cade1c4a3 100644 --- a/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/promo-panel.tsx @@ -4,7 +4,9 @@ import ForkAwesomeIcon from 'pl-fe/components/fork-awesome-icon'; import List, { ListItem } from 'pl-fe/components/list'; import HStack from 'pl-fe/components/ui/hstack'; import Widget from 'pl-fe/components/ui/widget'; -import { useInstance, useSettings, usePlFeConfig } from 'pl-fe/hooks'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; const PromoPanel: React.FC = () => { const instance = useInstance(); diff --git a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx index 59295c12c..06a6d7c49 100644 --- a/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/sign-up-panel.tsx @@ -10,7 +10,10 @@ import Text from 'pl-fe/components/ui/text'; import LoginForm from 'pl-fe/features/auth-login/components/login-form'; import OtpAuthForm from 'pl-fe/features/auth-login/components/otp-auth-form'; import ExternalLoginForm from 'pl-fe/features/external-login/components/external-login-form'; -import { useAppDispatch, useAppSelector, useInstance, useRegistrationStatus } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useRegistrationStatus } from 'pl-fe/hooks/useRegistrationStatus'; import { getRedirectUrl } from 'pl-fe/utils/redirect'; import { isStandalone } from 'pl-fe/utils/state'; diff --git a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx index f6ce99314..6d4cb889d 100644 --- a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx @@ -9,7 +9,8 @@ import HStack from 'pl-fe/components/ui/hstack'; import Stack from 'pl-fe/components/ui/stack'; import Text from 'pl-fe/components/ui/text'; import VerificationBadge from 'pl-fe/components/verification-badge'; -import { useAppSelector, useSettings } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import { getAcct } from 'pl-fe/utils/accounts'; import { shortNumberFormat } from 'pl-fe/utils/numbers'; import { displayFqn } from 'pl-fe/utils/state'; diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx index f80011dab..40c407601 100644 --- a/packages/pl-fe/src/features/ui/index.tsx +++ b/packages/pl-fe/src/features/ui/index.tsx @@ -17,7 +17,14 @@ import { useUserStream } from 'pl-fe/api/hooks/streaming/useUserStream'; import SidebarNavigation from 'pl-fe/components/sidebar-navigation'; import ThumbNavigation from 'pl-fe/components/thumb-navigation'; import Layout from 'pl-fe/components/ui/layout'; -import { useAppDispatch, useAppSelector, useOwnAccount, usePlFeConfig, useFeatures, useDraggedFiles, useInstance, useLoggedIn } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useDraggedFiles } from 'pl-fe/hooks/useDraggedFiles'; +import { useInstance } from 'pl-fe/hooks/useInstance'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; import AdminLayout from 'pl-fe/layouts/admin-layout'; import ChatsLayout from 'pl-fe/layouts/chats-layout'; import DefaultLayout from 'pl-fe/layouts/default-layout'; diff --git a/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx b/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx index 36d8dc148..69040d761 100644 --- a/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx +++ b/packages/pl-fe/src/features/ui/util/global-hotkeys.tsx @@ -3,7 +3,8 @@ import { useHistory } from 'react-router-dom'; import { resetCompose } from 'pl-fe/actions/compose'; import { FOCUS_EDITOR_COMMAND } from 'pl-fe/features/compose/editor/plugins/focus-plugin'; -import { useAppDispatch, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { useModalsStore } from 'pl-fe/stores/modals'; import { HotKeys } from '../components/hotkeys'; diff --git a/packages/pl-fe/src/features/ui/util/react-router-helpers.tsx b/packages/pl-fe/src/features/ui/util/react-router-helpers.tsx index cc94c0869..cfc430eac 100644 --- a/packages/pl-fe/src/features/ui/util/react-router-helpers.tsx +++ b/packages/pl-fe/src/features/ui/util/react-router-helpers.tsx @@ -3,7 +3,8 @@ import { ErrorBoundary, type FallbackProps } from 'react-error-boundary'; import { Redirect, Route, useHistory, RouteProps, RouteComponentProps, match as MatchType, useLocation } from 'react-router-dom'; import Layout from 'pl-fe/components/ui/layout'; -import { useOwnAccount, useSettings } from 'pl-fe/hooks'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useSettings } from 'pl-fe/hooks/useSettings'; import ColumnForbidden from '../components/column-forbidden'; import ColumnLoading from '../components/column-loading'; diff --git a/packages/pl-fe/src/hooks/index.ts b/packages/pl-fe/src/hooks/index.ts deleted file mode 100644 index 89c761d09..000000000 --- a/packages/pl-fe/src/hooks/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -export { useAppDispatch } from './useAppDispatch'; -export { useAppSelector } from './useAppSelector'; -export { useClickOutside } from './useClickOutside'; -export { useClient } from './useClient'; -export { useCompose } from './useCompose'; -export { useDebounce } from './useDebounce'; -export { useDraggedFiles } from './useDraggedFiles'; -export { useGetState } from './useGetState'; -export { useDimensions } from './useDimensions'; -export { useFeatures } from './useFeatures'; -export { useInstance } from './useInstance'; -export { useLoading } from './useLoading'; -export { useLocale } from './useLocale'; -export { useLoggedIn } from './useLoggedIn'; -export { useLogo } from './useLogo'; -export { useOwnAccount } from './useOwnAccount'; -export { usePrevious } from './usePrevious'; -export { useRegistrationStatus } from './useRegistrationStatus'; -export { useSettings } from './useSettings'; -export { usePlFeConfig } from './usePlFeConfig'; -export { useSystemTheme } from './useSystemTheme'; -export { useTheme } from './useTheme'; diff --git a/packages/pl-fe/src/init/pl-fe-head.tsx b/packages/pl-fe/src/init/pl-fe-head.tsx index c057a579c..8a496880c 100644 --- a/packages/pl-fe/src/init/pl-fe-head.tsx +++ b/packages/pl-fe/src/init/pl-fe-head.tsx @@ -1,12 +1,10 @@ import clsx from 'clsx'; import React, { useEffect } from 'react'; -import { - useSettings, - usePlFeConfig, - useTheme, - useLocale, -} from 'pl-fe/hooks'; +import { useLocale } from 'pl-fe/hooks/useLocale'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useSettings } from 'pl-fe/hooks/useSettings'; +import { useTheme } from 'pl-fe/hooks/useTheme'; import { normalizePlFeConfig } from 'pl-fe/normalizers'; import { startSentry } from 'pl-fe/sentry'; import { useModalsStore } from 'pl-fe/stores/modals'; diff --git a/packages/pl-fe/src/init/pl-fe-load.tsx b/packages/pl-fe/src/init/pl-fe-load.tsx index c24b0853e..38bb217f1 100644 --- a/packages/pl-fe/src/init/pl-fe-load.tsx +++ b/packages/pl-fe/src/init/pl-fe-load.tsx @@ -5,12 +5,10 @@ import { fetchInstance } from 'pl-fe/actions/instance'; import { fetchMe } from 'pl-fe/actions/me'; import { loadPlFeConfig } from 'pl-fe/actions/pl-fe'; import LoadingScreen from 'pl-fe/components/loading-screen'; -import { - useAppSelector, - useAppDispatch, - useOwnAccount, - useLocale, -} from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useLocale } from 'pl-fe/hooks/useLocale'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import MESSAGES from 'pl-fe/messages'; /** Load initial data from the backend */ diff --git a/packages/pl-fe/src/init/pl-fe-mount.tsx b/packages/pl-fe/src/init/pl-fe-mount.tsx index d6a5bf00d..5f68b2822 100644 --- a/packages/pl-fe/src/init/pl-fe-mount.tsx +++ b/packages/pl-fe/src/init/pl-fe-mount.tsx @@ -9,12 +9,10 @@ import * as BuildConfig from 'pl-fe/build-config'; import LoadingScreen from 'pl-fe/components/loading-screen'; import SiteErrorBoundary from 'pl-fe/components/site-error-boundary'; import { ModalRoot, OnboardingWizard } from 'pl-fe/features/ui/util/async-components'; -import { - useAppSelector, - useLoggedIn, - useOwnAccount, - usePlFeConfig, -} from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { useCachedLocationHandler } from 'pl-fe/utils/redirect'; const GdprBanner = React.lazy(() => import('pl-fe/components/gdpr-banner')); diff --git a/packages/pl-fe/src/layouts/default-layout.tsx b/packages/pl-fe/src/layouts/default-layout.tsx index 28ee55d8d..bac8e553b 100644 --- a/packages/pl-fe/src/layouts/default-layout.tsx +++ b/packages/pl-fe/src/layouts/default-layout.tsx @@ -7,7 +7,8 @@ import { TrendsPanel, SignUpPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; interface IDefaultLayout { children: React.ReactNode; diff --git a/packages/pl-fe/src/layouts/event-layout.tsx b/packages/pl-fe/src/layouts/event-layout.tsx index 03d4fdae1..d642ed28f 100644 --- a/packages/pl-fe/src/layouts/event-layout.tsx +++ b/packages/pl-fe/src/layouts/event-layout.tsx @@ -14,7 +14,8 @@ import { TrendsPanel, WhoToFollowPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { makeGetStatus } from 'pl-fe/selectors'; const getStatus = makeGetStatus(); diff --git a/packages/pl-fe/src/layouts/external-login-layout.tsx b/packages/pl-fe/src/layouts/external-login-layout.tsx index 950e5c8f1..206958115 100644 --- a/packages/pl-fe/src/layouts/external-login-layout.tsx +++ b/packages/pl-fe/src/layouts/external-login-layout.tsx @@ -7,7 +7,8 @@ import { TrendsPanel, SignUpPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; import { isStandalone } from 'pl-fe/utils/state'; interface IExternalLoginLayout { diff --git a/packages/pl-fe/src/layouts/home-layout.tsx b/packages/pl-fe/src/layouts/home-layout.tsx index 5e65fb3f6..caafe0947 100644 --- a/packages/pl-fe/src/layouts/home-layout.tsx +++ b/packages/pl-fe/src/layouts/home-layout.tsx @@ -19,7 +19,12 @@ import { BirthdayPanel, AnnouncementsPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useOwnAccount, useFeatures, usePlFeConfig, useDraggedFiles, useAppDispatch } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; +import { useDraggedFiles } from 'pl-fe/hooks/useDraggedFiles'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; import { useIsMobile } from 'pl-fe/hooks/useIsMobile'; interface IHomeLayout { diff --git a/packages/pl-fe/src/layouts/landing-layout.tsx b/packages/pl-fe/src/layouts/landing-layout.tsx index 56de4dfcb..cddcf3508 100644 --- a/packages/pl-fe/src/layouts/landing-layout.tsx +++ b/packages/pl-fe/src/layouts/landing-layout.tsx @@ -6,7 +6,8 @@ import { TrendsPanel, SignUpPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; interface ILandingLayout { children: React.ReactNode; diff --git a/packages/pl-fe/src/layouts/profile-layout.tsx b/packages/pl-fe/src/layouts/profile-layout.tsx index 472664eee..eaad0d85d 100644 --- a/packages/pl-fe/src/layouts/profile-layout.tsx +++ b/packages/pl-fe/src/layouts/profile-layout.tsx @@ -18,7 +18,9 @@ import { PinnedAccountsPanel, AccountNotePanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures, usePlFeConfig } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig'; import { getAcct } from 'pl-fe/utils/accounts'; interface IProfileLayout { diff --git a/packages/pl-fe/src/layouts/remote-instance-layout.tsx b/packages/pl-fe/src/layouts/remote-instance-layout.tsx index cd37fa437..9a946df23 100644 --- a/packages/pl-fe/src/layouts/remote-instance-layout.tsx +++ b/packages/pl-fe/src/layouts/remote-instance-layout.tsx @@ -7,7 +7,8 @@ import { InstanceInfoPanel, InstanceModerationPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useOwnAccount } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { federationRestrictionsDisclosed } from 'pl-fe/utils/state'; interface IRemoteInstanceLayout { diff --git a/packages/pl-fe/src/layouts/search-layout.tsx b/packages/pl-fe/src/layouts/search-layout.tsx index 54daf1953..4141975bc 100644 --- a/packages/pl-fe/src/layouts/search-layout.tsx +++ b/packages/pl-fe/src/layouts/search-layout.tsx @@ -7,7 +7,8 @@ import { TrendsPanel, SignUpPanel, } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; interface ISearchLayout { children: React.ReactNode; diff --git a/packages/pl-fe/src/layouts/status-layout.tsx b/packages/pl-fe/src/layouts/status-layout.tsx index 953fac5da..bdf0114c5 100644 --- a/packages/pl-fe/src/layouts/status-layout.tsx +++ b/packages/pl-fe/src/layouts/status-layout.tsx @@ -3,7 +3,8 @@ import React from 'react'; import Layout from 'pl-fe/components/ui/layout'; import LinkFooter from 'pl-fe/features/ui/components/link-footer'; import { WhoToFollowPanel, TrendsPanel, SignUpPanel } from 'pl-fe/features/ui/util/async-components'; -import { useAppSelector, useFeatures } from 'pl-fe/hooks'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; interface IStatusLayout { children: React.ReactNode; diff --git a/packages/pl-fe/src/queries/accounts.ts b/packages/pl-fe/src/queries/accounts.ts index 380d0d1c8..4ff5fc2f0 100644 --- a/packages/pl-fe/src/queries/accounts.ts +++ b/packages/pl-fe/src/queries/accounts.ts @@ -1,7 +1,8 @@ import { useMutation } from '@tanstack/react-query'; import { patchMeSuccess } from 'pl-fe/actions/me'; -import { useAppDispatch, useClient } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useClient } from 'pl-fe/hooks/useClient'; import toast from 'pl-fe/toast'; type IAccount = { diff --git a/packages/pl-fe/src/queries/chats.ts b/packages/pl-fe/src/queries/chats.ts index e5076b6f0..a43065f3e 100644 --- a/packages/pl-fe/src/queries/chats.ts +++ b/packages/pl-fe/src/queries/chats.ts @@ -7,7 +7,12 @@ import { importFetchedAccount, importFetchedAccounts } from 'pl-fe/actions/impor import { ChatWidgetScreens, useChatContext } from 'pl-fe/contexts/chat-context'; import { useStatContext } from 'pl-fe/contexts/stat-context'; import { Entities } from 'pl-fe/entity-store/entities'; -import { useAppDispatch, useAppSelector, useClient, useFeatures, useLoggedIn, useOwnAccount } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useAppSelector } from 'pl-fe/hooks/useAppSelector'; +import { useClient } from 'pl-fe/hooks/useClient'; +import { useFeatures } from 'pl-fe/hooks/useFeatures'; +import { useLoggedIn } from 'pl-fe/hooks/useLoggedIn'; +import { useOwnAccount } from 'pl-fe/hooks/useOwnAccount'; import { type ChatMessage, normalizeChatMessage } from 'pl-fe/normalizers'; import { reOrderChatListItems } from 'pl-fe/utils/chats'; import { flattenPages, updatePageItem } from 'pl-fe/utils/queries'; diff --git a/packages/pl-fe/src/queries/suggestions.ts b/packages/pl-fe/src/queries/suggestions.ts index 427c73dcd..c22b4b39c 100644 --- a/packages/pl-fe/src/queries/suggestions.ts +++ b/packages/pl-fe/src/queries/suggestions.ts @@ -2,7 +2,8 @@ import { useMutation, keepPreviousData, useQuery } from '@tanstack/react-query'; import { fetchRelationships } from 'pl-fe/actions/accounts'; import { importFetchedAccounts } from 'pl-fe/actions/importer'; -import { useAppDispatch, useClient } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useClient } from 'pl-fe/hooks/useClient'; import { removePageItem } from '../utils/queries'; diff --git a/packages/pl-fe/src/queries/trends.ts b/packages/pl-fe/src/queries/trends.ts index bf3cc8f0b..812af9689 100644 --- a/packages/pl-fe/src/queries/trends.ts +++ b/packages/pl-fe/src/queries/trends.ts @@ -1,7 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { fetchTrendsSuccess } from 'pl-fe/actions/trends'; -import { useAppDispatch, useClient } from 'pl-fe/hooks'; +import { useAppDispatch } from 'pl-fe/hooks/useAppDispatch'; +import { useClient } from 'pl-fe/hooks/useClient'; import type { Tag } from 'pl-api'; diff --git a/packages/pl-fe/src/reducers/admin.ts b/packages/pl-fe/src/reducers/admin.ts index 54ea78bda..aa23ae2a6 100644 --- a/packages/pl-fe/src/reducers/admin.ts +++ b/packages/pl-fe/src/reducers/admin.ts @@ -17,7 +17,7 @@ import { ADMIN_USER_APPROVE_REQUEST, ADMIN_USER_APPROVE_SUCCESS, } from 'pl-fe/actions/admin'; -import { normalizeAdminReport, type AdminReport } from 'pl-fe/normalizers'; +import { normalizeAdminReport, type AdminReport } from 'pl-fe/normalizers/admin-report'; import type { AdminAccount, AdminGetAccountsParams, AdminReport as BaseAdminReport } from 'pl-api'; import type { Config } from 'pl-fe/utils/config-db';