From 24ebb6bd7e7d9cab2c51c854ab6d1dbabfe2c16e Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 22 Jun 2023 18:12:15 +0200
Subject: [PATCH] move useBufferedFeeds to Home

---
 src/App.js                    | 15 +--------------
 src/components/Post.jsx       |  2 +-
 src/components/views/Home.jsx | 12 +++++++++++-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/App.js b/src/App.js
index 2dcf67b2..c6bfd26d 100755
--- a/src/App.js
+++ b/src/App.js
@@ -1,7 +1,6 @@
 import React, { useEffect } from 'react';
 import { Route, Routes, useLocation } from 'react-router-dom';
 import { Helmet } from 'react-helmet-async';
-import { useAccount, useBufferedFeeds } from '@plebbit/plebbit-react-hooks';
 import 'react-tooltip/dist/react-tooltip.css';
 import 'react-toastify/dist/ReactToastify.css';
 import useGeneralStore from './hooks/stores/useGeneralStore';
@@ -27,7 +26,7 @@ import useSuccess from "./hooks/useSuccess";
 export default function App() {
   const { 
     bodyStyle, setBodyStyle,
-    defaultSubplebbits, setDefaultSubplebbits,
+    setDefaultSubplebbits,
     isCaptchaOpen, setIsCaptchaOpen,
     setIsSettingsOpen,
     selectedStyle, setSelectedStyle,
@@ -38,8 +37,6 @@ export default function App() {
   const location = useLocation();
   const isHomeRoute = location.pathname === "/";
 
-  const account = useAccount();
-
   const [, setNewErrorMessage] = useError();
   const [, setNewSuccessMessage] = useSuccess();
 
@@ -57,16 +54,6 @@ export default function App() {
       return;
     }
   }, [setNewErrorMessage, setNewSuccessMessage]);
-
-  // preload default subs and subscriptions
-  useBufferedFeeds({
-    feedsOptions: [
-      {subplebbitAddresses: defaultSubplebbits.map(
-        (subplebbit) => subplebbit.address
-      ), sortType: 'active'},
-      {subplebbitAddresses: account?.subscriptions, sortType: 'active'}
-    ]
-  });
   
   // preload banners
   useEffect(() => {
diff --git a/src/components/Post.jsx b/src/components/Post.jsx
index 5935cabe..1eae413e 100644
--- a/src/components/Post.jsx
+++ b/src/components/Post.jsx
@@ -50,7 +50,7 @@ const Post = ({ content, postQuoteOnClick, postQuoteOnOver, postQuoteOnLeave, po
     
     const regex = new RegExp(`${patternC}|${patternPC}|${patternU}|${patternP}`, 'g');
   
-    return children.flatMap((child, i) => {
+    return children?.flatMap((child, i) => {
       if (typeof child !== 'string') {
         return child;
       }
diff --git a/src/components/views/Home.jsx b/src/components/views/Home.jsx
index ebd24ad3..49e886fa 100644
--- a/src/components/views/Home.jsx
+++ b/src/components/views/Home.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useEffect, useRef } from 'react';
 import { Helmet } from 'react-helmet-async';
-import { useAccount } from '@plebbit/plebbit-react-hooks';
+import { useAccount, useBufferedFeeds } from '@plebbit/plebbit-react-hooks';
 import { Link, useNavigate } from 'react-router-dom';
 import { Container, Header, Logo, Page, Search, About, AboutTitle, AboutContent, Boards, BoardsTitle, BoardsContent, Footer } from '../styled/views/Home.styled';
 import BoardAvatar from '../BoardAvatar';
@@ -29,6 +29,16 @@ const Home = () => {
   const prevStyle = useRef(selectedStyle);
   const prevBodyStyle = useRef(bodyStyle);
 
+  // preload default subs and subscriptions
+  useBufferedFeeds({
+    feedsOptions: [
+      {subplebbitAddresses: defaultSubplebbits.map(
+        (subplebbit) => subplebbit.address
+      ), sortType: 'active'},
+      {subplebbitAddresses: account?.subscriptions, sortType: 'active'}
+    ]
+  });
+
   // prevent dark mode
   useEffect(() => {
     const currentPrevStyle = prevStyle.current;