diff --git a/packages/pl-fe/src/actions/push-notifications/registerer.ts b/packages/pl-fe/src/actions/push-notifications/registerer.ts index 8516692c2..8709df9b6 100644 --- a/packages/pl-fe/src/actions/push-notifications/registerer.ts +++ b/packages/pl-fe/src/actions/push-notifications/registerer.ts @@ -5,8 +5,8 @@ import { decode as decodeBase64 } from '@/utils/base64'; import { setBrowserSupport, setSubscription, clearSubscription } from './setter'; +import type { Me } from '@/reducers/me'; import type { AppDispatch, RootState } from '@/store'; -import type { Me } from '@/types/pl-fe'; // Taken from https://www.npmjs.com/package/web-push const urlBase64ToUint8Array = (base64String: string) => { diff --git a/packages/pl-fe/src/components/status-action-bar.tsx b/packages/pl-fe/src/components/status-action-bar.tsx index 407d92d32..59c65626c 100644 --- a/packages/pl-fe/src/components/status-action-bar.tsx +++ b/packages/pl-fe/src/components/status-action-bar.tsx @@ -57,8 +57,8 @@ import Popover from './ui/popover'; import type { Menu } from '@/components/dropdown-menu'; import type { Emoji as EmojiType } from '@/features/emoji'; import type { UnauthorizedModalAction } from '@/modals/unauthorized-modal'; +import type { Me } from '@/reducers/me'; import type { SelectedStatus } from '@/selectors'; -import type { Me } from '@/types/pl-fe'; const messages = defineMessages({ adminAccount: { id: 'status.admin_account', defaultMessage: 'Moderate @{name}' }, diff --git a/packages/pl-fe/src/reducers/me.ts b/packages/pl-fe/src/reducers/me.ts index 7ac703aa5..a245d151e 100644 --- a/packages/pl-fe/src/reducers/me.ts +++ b/packages/pl-fe/src/reducers/me.ts @@ -13,7 +13,8 @@ import { } from '../actions/me'; import type { PlfeResponse } from '@/api'; -import type { Me } from '@/types/pl-fe'; + +type Me = string | null | false; const initialState: Me = null; @@ -42,4 +43,4 @@ const me = (state: Me = initialState, action: AuthAction | MeAction): Me => { } }; -export { me as default }; +export { me as default, type Me }; diff --git a/packages/pl-fe/src/types/pl-fe.ts b/packages/pl-fe/src/types/pl-fe.ts deleted file mode 100644 index 45201c06f..000000000 --- a/packages/pl-fe/src/types/pl-fe.ts +++ /dev/null @@ -1,3 +0,0 @@ -type Me = string | null | false; - -export { Me }; diff --git a/packages/pl-fe/src/utils/url-purify.ts b/packages/pl-fe/src/utils/url-purify.ts index 0b9658402..26b7ed4e0 100644 --- a/packages/pl-fe/src/utils/url-purify.ts +++ b/packages/pl-fe/src/utils/url-purify.ts @@ -21,7 +21,7 @@ import { import KVStore from '@/storage/kv-store'; -import type { Me } from '@/types/pl-fe'; +import type { Me } from '@/reducers/me'; interface KVStoreRulesItem { hashUrl?: string;