Remove prefs query
This commit is contained in:
@@ -12,7 +12,6 @@ import {logger} from '#/logger'
|
|||||||
import {SavedFeedItem, useSavedFeeds} from '#/state/queries/feed'
|
import {SavedFeedItem, useSavedFeeds} from '#/state/queries/feed'
|
||||||
import {
|
import {
|
||||||
useOverwriteSavedFeedsMutation,
|
useOverwriteSavedFeedsMutation,
|
||||||
usePreferencesQuery,
|
|
||||||
useUpdateSavedFeedsMutation,
|
useUpdateSavedFeedsMutation,
|
||||||
} from '#/state/queries/preferences'
|
} from '#/state/queries/preferences'
|
||||||
import {useSetMinimalShellMode} from '#/state/shell'
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
@@ -56,7 +55,6 @@ export function SavedFeeds({}: Props) {
|
|||||||
const {isMobile, isTabletOrDesktop} = useWebMediaQueries()
|
const {isMobile, isTabletOrDesktop} = useWebMediaQueries()
|
||||||
const {screen} = useAnalytics()
|
const {screen} = useAnalytics()
|
||||||
const setMinimalShellMode = useSetMinimalShellMode()
|
const setMinimalShellMode = useSetMinimalShellMode()
|
||||||
const {data: preferences} = usePreferencesQuery()
|
|
||||||
const {
|
const {
|
||||||
data: savedFeeds,
|
data: savedFeeds,
|
||||||
isPlaceholderData: isSavedFeedsPlaceholder,
|
isPlaceholderData: isSavedFeedsPlaceholder,
|
||||||
@@ -73,15 +71,16 @@ export function SavedFeeds({}: Props) {
|
|||||||
* Use optimistic data if exists and no error, otherwise fallback to remote
|
* Use optimistic data if exists and no error, otherwise fallback to remote
|
||||||
* data
|
* data
|
||||||
*/
|
*/
|
||||||
const currentFeeds =
|
const optimisticCurrentFeeds =
|
||||||
optimisticSavedFeedsResponse && !writeSavedFeedsError
|
optimisticSavedFeedsResponse && !writeSavedFeedsError
|
||||||
? optimisticSavedFeedsResponse
|
? optimisticSavedFeedsResponse
|
||||||
: preferences?.savedFeeds || []
|
: savedFeeds?.feeds?.map(f => f.config) || []
|
||||||
const pinnedFeeds = currentFeeds.filter(f => f.pinned)
|
const pinnedFeeds = optimisticCurrentFeeds.filter(f => f.pinned)
|
||||||
const unpinnedFeeds = currentFeeds.filter(f => !f.pinned)
|
const unpinnedFeeds = optimisticCurrentFeeds.filter(f => !f.pinned)
|
||||||
const noSavedFeedsOfAnyType = pinnedFeeds.length + unpinnedFeeds.length === 0
|
const noSavedFeedsOfAnyType = pinnedFeeds.length + unpinnedFeeds.length === 0
|
||||||
const noFollowingFeed =
|
const noFollowingFeed =
|
||||||
currentFeeds.every(f => f.type !== 'timeline') && !noSavedFeedsOfAnyType
|
optimisticCurrentFeeds.every(f => f.type !== 'timeline') &&
|
||||||
|
!noSavedFeedsOfAnyType
|
||||||
|
|
||||||
const isSavedFeedsLoading =
|
const isSavedFeedsLoading =
|
||||||
isSavedFeedsPlaceholder && !savedFeeds?.feeds.length
|
isSavedFeedsPlaceholder && !savedFeeds?.feeds.length
|
||||||
@@ -147,7 +146,7 @@ export function SavedFeeds({}: Props) {
|
|||||||
feed={f}
|
feed={f}
|
||||||
overwriteSavedFeeds={overwriteSavedFeeds}
|
overwriteSavedFeeds={overwriteSavedFeeds}
|
||||||
resetSaveFeedsMutationState={resetSaveFeedsMutationState}
|
resetSaveFeedsMutationState={resetSaveFeedsMutationState}
|
||||||
currentFeeds={currentFeeds}
|
currentFeeds={optimisticCurrentFeeds}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
@@ -207,7 +206,7 @@ export function SavedFeeds({}: Props) {
|
|||||||
feed={f}
|
feed={f}
|
||||||
overwriteSavedFeeds={overwriteSavedFeeds}
|
overwriteSavedFeeds={overwriteSavedFeeds}
|
||||||
resetSaveFeedsMutationState={resetSaveFeedsMutationState}
|
resetSaveFeedsMutationState={resetSaveFeedsMutationState}
|
||||||
currentFeeds={currentFeeds}
|
currentFeeds={optimisticCurrentFeeds}
|
||||||
/>
|
/>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
Reference in New Issue
Block a user