diff --git a/src/components/profile/follows.tsx b/src/components/profile/follows.tsx
index 9ba8b4ed..38faa255 100644
--- a/src/components/profile/follows.tsx
+++ b/src/components/profile/follows.tsx
@@ -1,19 +1,21 @@
-import { RelayContext } from '@components/contexts/relay';
+import { RelayContext } from '@components/relaysProvider';
-import useLocalStorage from '@rehooks/local-storage';
+import { relaysAtom } from '@stores/relays';
+
+import { useAtomValue } from 'jotai';
import { Author } from 'nostr-relaypool';
import { useContext, useEffect, useState } from 'react';
export default function ProfileFollows({ id }: { id: string }) {
- const relayPool: any = useContext(RelayContext);
- const [relays]: any = useLocalStorage('relays');
+ const pool: any = useContext(RelayContext);
+ const relays: any = useAtomValue(relaysAtom);
const [follows, setFollows] = useState(null);
useEffect(() => {
- const user = new Author(relayPool, relays, id);
+ const user = new Author(pool, relays, id);
user.follows((res) => setFollows(res), 0);
- }, [id, relayPool, relays]);
+ }, [id, pool, relays]);
return (
diff --git a/src/components/profile/metadata.tsx b/src/components/profile/metadata.tsx
index 8b3b3cdc..60be0da9 100644
--- a/src/components/profile/metadata.tsx
+++ b/src/components/profile/metadata.tsx
@@ -1,11 +1,13 @@
-import { RelayContext } from '@components/contexts/relay';
import { ImageWithFallback } from '@components/imageWithFallback';
+import { RelayContext } from '@components/relaysProvider';
+
+import { relaysAtom } from '@stores/relays';
import { truncate } from '@utils/truncate';
-import useLocalStorage from '@rehooks/local-storage';
import Avatar from 'boring-avatars';
import destr from 'destr';
+import { useAtomValue } from 'jotai';
import Image from 'next/image';
import { Author } from 'nostr-relaypool';
import { useContext, useEffect, useState } from 'react';
@@ -13,15 +15,15 @@ import { useContext, useEffect, useState } from 'react';
const DEFAULT_BANNER = 'https://bafybeiacwit7hjmdefqggxqtgh6ht5dhth7ndptwn2msl5kpkodudsr7py.ipfs.w3s.link/banner-1.jpg';
export default function ProfileMetadata({ id }: { id: string }) {
- const relayPool: any = useContext(RelayContext);
- const [relays]: any = useLocalStorage('relays');
+ const pool: any = useContext(RelayContext);
+ const relays: any = useAtomValue(relaysAtom);
const [profile, setProfile] = useState(null);
useEffect(() => {
- const user = new Author(relayPool, relays, id);
+ const user = new Author(pool, relays, id);
user.metaData((res) => setProfile(destr(res.content)), 0);
- }, [id, relayPool, relays]);
+ }, [id, pool, relays]);
return (
<>
diff --git a/src/components/profile/notes.tsx b/src/components/profile/notes.tsx
index f3f9c979..1edb8d3f 100644
--- a/src/components/profile/notes.tsx
+++ b/src/components/profile/notes.tsx
@@ -1,20 +1,22 @@
-import { RelayContext } from '@components/contexts/relay';
import { Content } from '@components/note/content';
+import { RelayContext } from '@components/relaysProvider';
-import useLocalStorage from '@rehooks/local-storage';
+import { relaysAtom } from '@stores/relays';
+
+import { useAtomValue } from 'jotai';
import { Author } from 'nostr-relaypool';
import { useContext, useEffect, useState } from 'react';
export default function ProfileNotes({ id }: { id: string }) {
- const relayPool: any = useContext(RelayContext);
- const [relays]: any = useLocalStorage('relays');
+ const pool: any = useContext(RelayContext);
+ const relays: any = useAtomValue(relaysAtom);
const [data, setData] = useState([]);
useEffect(() => {
- const user = new Author(relayPool, relays, id);
+ const user = new Author(pool, relays, id);
user.text((res) => setData((data) => [...data, res]), 0, 100);
- }, [id, relayPool, relays]);
+ }, [id, pool, relays]);
return (
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index cac8697f..8af6cb7d 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -2,7 +2,7 @@ import RelayProvider from '@components/relaysProvider';
import { relaysAtom } from '@stores/relays';
-import { Provider, useAtom } from 'jotai';
+import { Provider, useAtomValue } from 'jotai';
import type { NextPage } from 'next';
import type { AppProps } from 'next/app';
import { ReactElement, ReactNode } from 'react';
@@ -21,7 +21,7 @@ type AppPropsWithLayout = AppProps & {
export default function MyApp({ Component, pageProps }: AppPropsWithLayout) {
// Use the layout defined at the page level, if available
const getLayout = Component.getLayout ?? ((page) => page);
- const [relays] = useAtom(relaysAtom);
+ const relays = useAtomValue(relaysAtom);
return (
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index a88903d7..6149c8df 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -14,7 +14,7 @@ export default function Page() {
getAccounts()
.then((res: any) => {
if (res.length > 0) {
- router.push('/newsfeed/circle');
+ router.push('/newsfeed/following');
} else {
router.push('/onboarding');
}
diff --git a/src/pages/newsfeed/[id].tsx b/src/pages/newsfeed/[id].tsx
index b6d7ce27..caa7d991 100644
--- a/src/pages/newsfeed/[id].tsx
+++ b/src/pages/newsfeed/[id].tsx
@@ -6,9 +6,11 @@ import { ContentExtend } from '@components/note/content/extend';
import FormComment from '@components/note/form/comment';
import { RelayContext } from '@components/relaysProvider';
+import { relaysAtom } from '@stores/relays';
+
import { getNoteByID } from '@utils/storage';
-import useLocalStorage from '@rehooks/local-storage';
+import { useAtomValue } from 'jotai';
import { useRouter } from 'next/router';
import {
JSXElementConstructor,
@@ -26,7 +28,7 @@ export default function Page() {
const router = useRouter();
const id = router.query.id;
- const [relays]: any = useLocalStorage('relays');
+ const relays: any = useAtomValue(relaysAtom);
const [rootEvent, setRootEvent] = useState(null);
const [comments, setComments] = useState([]);
diff --git a/src/pages/newsfeed/circle.tsx b/src/pages/newsfeed/circle.tsx
index 1f7d6c53..f37272fc 100644
--- a/src/pages/newsfeed/circle.tsx
+++ b/src/pages/newsfeed/circle.tsx
@@ -1,43 +1,10 @@
import BaseLayout from '@layouts/base';
import WithSidebarLayout from '@layouts/withSidebar';
-import { Note } from '@components/note';
-
-import { notesAtom } from '@stores/note';
-
-import { useVirtualizer } from '@tanstack/react-virtual';
-import { useAtom } from 'jotai';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useRef } from 'react';
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
export default function Page() {
- const [data]: any = useAtom(notesAtom);
-
- const parentRef = useRef(null);
-
- const virtualizer = useVirtualizer({
- count: data.length,
- overscan: 5,
- estimateSize: () => 600,
- getScrollElement: () => parentRef.current,
- getItemKey: (index) => data[index].id,
- });
- const items = virtualizer.getVirtualItems();
-
- return (
-
- {items.length > 0 && (
-
-
- {items.map((virtualRow) => (
-
-
-
- ))}
-
-
- )}
-
- {hasNewerNote && (
-
-
-
- )}
-
,
- EmptyPlaceholder: () => ,
- ScrollSeekPlaceholder: () => ,
- }}
- computeItemKey={computeItemKey}
- scrollSeekConfiguration={{
- enter: (velocity) => Math.abs(velocity) > 800,
- exit: (velocity) => Math.abs(velocity) < 500,
- }}
- endReached={loadMore}
- overscan={800}
- increaseViewportBy={1000}
- className="scrollbar-hide relative h-full w-full"
- style={{
- contain: 'strict',
- }}
- />
+
+
+ {hasNewerNote && (
+
+
+
+ )}
+
+
+
+
+
+ {items.length > 0 && (
+
+
+ {items.map((virtualRow) => (
+
+
+
+ ))}
+
+
+ )}
+