Fix

kulgg · Jun 28, 2023 · 50671b2 · 50671b2
1 parent 21a95b4
commit 50671b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/[handle]/FetchData.tsx b/app/[handle]/FetchData.tsx
@@ -38,8 +38,8 @@ function FetchData({ handle }: { handle: string }) {
   const { toast } = useToast();
 
   useEffect(() => {
-    console.log("Initial useEffect");
     if (accountName != handle) {
+      scrollTo({ top: 0 });
       setAccountName(handle);
       setAccountStatus("");
       setNumStatusResponses(0);

diff --git a/app/[handle]/Tweets.tsx b/app/[handle]/Tweets.tsx
@@ -9,6 +9,7 @@ import {
   twitterStatusQueueAtom,
   settingsAtom,
   isAutoScrollAtom,
+  accountNameAtom,
 } from "@/lib/atoms";
 import { ITweetMap } from "@/lib/filter";
 import useFetchQueue from "@/lib/hooks/use-fetch-queue";
@@ -26,6 +27,7 @@ import React, {
 function Tweets({ handle }: { handle: string }) {
   const bottomElementRef = useRef<HTMLDivElement>(null);
   const isAutoScroll = useAtomValue(isAutoScrollAtom);
+  const accountName = useAtomValue(accountNameAtom);
 
   const [archiveMap, setArchiveMap] = useAtom(archivedTweetsAtom);
   const [twitterStatusQueue, setTwitterStatusQueue] = useAtom(
@@ -103,14 +105,14 @@ function Tweets({ handle }: { handle: string }) {
   });
 
   useEffect(() => {
-    if (isAutoScroll) {
+    if (isAutoScroll && results.length > 0 && accountName === handle) {
       bottomElementRef.current?.scrollIntoView({
         behavior: "smooth",
         inline: "nearest",
         block: "center",
       });
     }
-  }, [results, isAutoScroll]);
+  }, [results, isAutoScroll, accountName, handle]);
 
   return (
     <div>