diff --git a/packages/pl-fe/src/components/loading-screen.tsx b/packages/pl-fe/src/components/loading-screen.tsx index 236181780..afc95cb87 100644 --- a/packages/pl-fe/src/components/loading-screen.tsx +++ b/packages/pl-fe/src/components/loading-screen.tsx @@ -1,16 +1,14 @@ import React from 'react'; /** Fullscreen loading indicator. */ -const LoadingScreen: React.FC = () => { - return ( -
-
-
-
-
+const LoadingScreen: React.FC = () => ( +
+
+
+
- ); -}; +
+); export { LoadingScreen as default }; diff --git a/packages/pl-fe/src/pages/utils/landing.tsx b/packages/pl-fe/src/pages/utils/landing.tsx index 8934455cf..97761ee43 100644 --- a/packages/pl-fe/src/pages/utils/landing.tsx +++ b/packages/pl-fe/src/pages/utils/landing.tsx @@ -12,51 +12,49 @@ import sourceCode from 'pl-fe/utils/code'; import { LogoText } from '../timelines/landing-timeline'; -const LandingPage = () => { - return ( - <> - - - - pl-fe - - - - - - - - } truncate={false} /> - - - - } truncate={false} /> - - - - } truncate={false} /> - - - - } truncate={false} /> - - - - } truncate={false} /> - - - - } truncate={false} /> - - - - - - - +const LandingPage = () => ( + <> + + + + pl-fe + + + + + + + + } truncate={false} /> + + + + } truncate={false} /> + + + + } truncate={false} /> + + + + } truncate={false} /> + + + + } truncate={false} /> + + + + } truncate={false} /> + + - - ); -}; + + + + + + +); export { LandingPage as default }; diff --git a/packages/pl-fe/src/selectors/index.ts b/packages/pl-fe/src/selectors/index.ts index c6e144488..090dbc01a 100644 --- a/packages/pl-fe/src/selectors/index.ts +++ b/packages/pl-fe/src/selectors/index.ts @@ -122,51 +122,49 @@ const checkFiltered = (index: string, filters: Array) => type APIStatus = { id: string; username?: string }; -const makeGetStatus = () => { - return createSelector( - [ - (state: RootState, { id }: APIStatus) => state.statuses[id], - (state: RootState, { id }: APIStatus) => state.statuses[state.statuses[id]?.reblog_id || ''] || null, - (state: RootState, { id }: APIStatus) => state.statuses[state.statuses[id]?.quote_id || ''] || null, - (state: RootState, { id }: APIStatus) => { - const group = state.statuses[id]?.group_id; - if (group) return state.entities[Entities.GROUPS]?.store[group] as Group; - return undefined; - }, - (state: RootState, { id }: APIStatus) => state.polls[id] || null, - (_state: RootState, { username }: APIStatus) => username, - getFilters, - (state: RootState) => state.me, - (state: RootState) => state.auth.client.features, - ], +const makeGetStatus = () => createSelector( + [ + (state: RootState, { id }: APIStatus) => state.statuses[id], + (state: RootState, { id }: APIStatus) => state.statuses[state.statuses[id]?.reblog_id || ''] || null, + (state: RootState, { id }: APIStatus) => state.statuses[state.statuses[id]?.quote_id || ''] || null, + (state: RootState, { id }: APIStatus) => { + const group = state.statuses[id]?.group_id; + if (group) return state.entities[Entities.GROUPS]?.store[group] as Group; + return undefined; + }, + (state: RootState, { id }: APIStatus) => state.polls[id] || null, + (_state: RootState, { username }: APIStatus) => username, + getFilters, + (state: RootState) => state.me, + (state: RootState) => state.auth.client.features, + ], - (statusBase, statusReblog, statusQuote, statusGroup, poll, username, filters, me, features) => { + (statusBase, statusReblog, statusQuote, statusGroup, poll, username, filters, me, features) => { // const locale = getLocale('en'); - if (!statusBase) return null; - const { account } = statusBase; - const accountUsername = account.acct; + if (!statusBase) return null; + const { account } = statusBase; + const accountUsername = account.acct; - // Must be owner of status if username exists. - if (accountUsername !== username && username !== undefined) { - return null; - } + // Must be owner of status if username exists. + if (accountUsername !== username && username !== undefined) { + return null; + } - const filtered = features.filtersV2 - ? statusBase.filtered - : features.filters && account.id !== me && checkFiltered(statusReblog?.search_index || statusBase.search_index || '', filters) || []; + const filtered = features.filtersV2 + ? statusBase.filtered + : features.filters && account.id !== me && checkFiltered(statusReblog?.search_index || statusBase.search_index || '', filters) || []; - return { - ...statusBase, - reblog: statusReblog || null, - quote: statusQuote || null, - group: statusGroup || null, - poll, - filtered, - }; - }, - ); -}; + return { + ...statusBase, + reblog: statusReblog || null, + quote: statusQuote || null, + group: statusGroup || null, + poll, + filtered, + }; + }, +); type SelectedStatus = Exclude>, null>;