diff --git a/src/components/views/All.jsx b/src/components/views/All.jsx index b6def524..adaee067 100755 --- a/src/components/views/All.jsx +++ b/src/components/views/All.jsx @@ -138,7 +138,8 @@ const All = () => { const addresses = defaultSubplebbits.map((subplebbit) => subplebbit.address); const { feed, loadMore } = useFeed({ subplebbitAddresses: addresses, sortType: 'active' }); const { subplebbits } = useSubplebbits({ subplebbitAddresses: addresses, sortType: 'active' }); - const [selectedFeed, setSelectedFeed] = useState(feed.sort((a, b) => b.timestamp - a.timestamp)); + const [selectedFeed, setSelectedFeed] = useState(feed); + let feedData = [...feed]; const stateString = useFeedStateString(addresses); @@ -282,10 +283,6 @@ const All = () => { } }, [errorString, setNewErrorMessage]); - useEffect(() => { - setSelectedFeed(feed.sort((a, b) => b.timestamp - a.timestamp)); - }, [feed]); - const flattenedRepliesByThread = useMemo(() => { return selectedFeed.reduce((acc, thread) => { const replies = flattenCommentsPages(thread.replies); @@ -710,7 +707,7 @@ const All = () => { {feed ? ( { if (editedComments[thread.cid]) { thread = editedComments[thread.cid]; diff --git a/src/components/views/AllCatalog.jsx b/src/components/views/AllCatalog.jsx index 6d6180c0..46ab802e 100755 --- a/src/components/views/AllCatalog.jsx +++ b/src/components/views/AllCatalog.jsx @@ -735,14 +735,14 @@ const AllCatalog = () => { const addresses = defaultSubplebbits.map((subplebbit) => subplebbit.address); const { feed, hasMore, loadMore } = useFeed({ subplebbitAddresses: addresses, sortType: 'active' }); const { subplebbits } = useSubplebbits({ subplebbitAddresses: addresses, sortType: 'active' }); - const [selectedFeed, setSelectedFeed] = useState(feed.sort((a, b) => b.timestamp - a.timestamp)); + let feedData = [...feed]; const stateString = useFeedStateString(addresses); const columnWidth = 180; const windowWidth = useWindowWidth(); const columnCount = Math.floor(windowWidth / columnWidth); - const rows = useFeedRows(selectedFeed, columnCount); + const rows = useFeedRows(feedData, columnCount); // mobile navbar scroll effect useEffect(() => { @@ -779,7 +779,6 @@ const AllCatalog = () => { const handleClickTitle = (title, address) => { setSelectedTitle(title); setSelectedAddress(address); - setSelectedFeed(feed.filter((feed) => feed.title === title)); }; const location = useLocation(); diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx index 605003ab..f01520b5 100755 --- a/src/components/views/Subscriptions.jsx +++ b/src/components/views/Subscriptions.jsx @@ -136,8 +136,9 @@ const Subscriptions = () => { useAnonModeRef(selectedThreadCidRef, anonymousMode && executeAnonMode); const { feed, loadMore } = useFeed({ subplebbitAddresses: account?.subscriptions, sortType: 'active' }); - const [selectedFeed, setSelectedFeed] = useState(feed.sort((a, b) => b.timestamp - a.timestamp)); const { subplebbits } = useSubplebbits({ subplebbitAddresses: account?.subscriptions, sortType: 'active' }); + const [selectedFeed, setSelectedFeed] = useState(feed); + let feedData = [...feed]; const stateString = useFeedStateString(account?.subscriptions); @@ -714,7 +715,7 @@ const Subscriptions = () => { {!feed ? null : ( { if (editedComments[thread.cid]) { thread = editedComments[thread.cid]; diff --git a/src/components/views/SubscriptionsCatalog.jsx b/src/components/views/SubscriptionsCatalog.jsx index 53d531c1..49d18321 100755 --- a/src/components/views/SubscriptionsCatalog.jsx +++ b/src/components/views/SubscriptionsCatalog.jsx @@ -733,15 +733,15 @@ const SubscriptionsCatalog = () => { const [isCreateBoardOpen, setIsCreateBoardOpen] = useState(false); const { feed, hasMore, loadMore } = useFeed({ subplebbitAddresses: account?.subscriptions, sortType: 'active' }); - const [selectedFeed, setSelectedFeed] = useState(feed.sort((a, b) => b.timestamp - a.timestamp)); const { subplebbits } = useSubplebbits({ subplebbitAddresses: account?.subscriptions, sortType: 'active' }); + let feedData = [...feed]; const stateString = useFeedStateString(account?.subscriptions); const columnWidth = 180; const windowWidth = useWindowWidth(); const columnCount = Math.floor(windowWidth / columnWidth); - const rows = useFeedRows(selectedFeed, columnCount); + const rows = useFeedRows(feedData, columnCount); // mobile navbar scroll effect useEffect(() => { @@ -760,7 +760,6 @@ const SubscriptionsCatalog = () => { const handleClickTitle = (title, address) => { setSelectedTitle(title); setSelectedAddress(address); - setSelectedFeed(feed.filter((feed) => feed.title === title)); }; // mobile navbar board select functionality