LFG !!!

src/pages/onboarding/create/index.tsx

@@ -1,13 +1,17 @@
 import BaseLayout from '@layouts/base';
 
-import { pool } from '@utils/pool';
-import { createAccount, getAllRelays } from '@utils/storage';
+import { RelayContext } from '@components/relaysProvider';
+
+import { relaysAtom } from '@stores/relays';
+
+import { createAccount } from '@utils/storage';
 
 import { EyeClosedIcon, EyeOpenIcon } from '@radix-ui/react-icons';
+import { useAtom } from 'jotai';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { generatePrivateKey, getEventHash, getPublicKey, nip19, signEvent } from 'nostr-tools';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useMemo, useState } from 'react';
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useContext, useMemo, useState } from 'react';
 import { Config, names, uniqueNamesGenerator } from 'unique-names-generator';
 
 const config: Config = {
@@ -16,7 +20,9 @@ const config: Config = {
 
 export default function Page() {
   const router = useRouter();
+  const pool: any = useContext(RelayContext);
 
+  const [relays] = useAtom(relaysAtom);
   const [type, setType] = useState('password');
   const [loading, setLoading] = useState(false);
 
@@ -78,16 +84,11 @@ export default function Page() {
     // insert to database then broadcast
     createAccount(data)
       .then(() => {
-        getAllRelays()
-          .then((res) => {
-            // publish to relays
-            pool(res).publish(event, res);
-            router.push({
-              pathname: '/onboarding/create/step-2',
-              query: { id: pubKey, privkey: privKey },
-            });
-          })
-          .catch(console.error);
+        pool.publish(event, relays);
+        router.push({
+          pathname: '/onboarding/create/step-2',
+          query: { id: pubKey, privkey: privKey },
+        });
       })
       .catch(console.error);
   };

src/pages/onboarding/create/step-2.tsx

@@ -1,15 +1,27 @@
 import BaseLayout from '@layouts/base';
 
+import { RelayContext } from '@components/relaysProvider';
 import { UserBase } from '@components/user/base';
 
-import { pool } from '@utils/pool';
-import { createFollows, getAllRelays } from '@utils/storage';
+import { relaysAtom } from '@stores/relays';
+
+import { createFollows } from '@utils/storage';
 
 import { CheckCircledIcon } from '@radix-ui/react-icons';
 import { createClient } from '@supabase/supabase-js';
+import { useAtom } from 'jotai';
 import { useRouter } from 'next/router';
 import { getEventHash, signEvent } from 'nostr-tools';
-import { JSXElementConstructor, Key, ReactElement, ReactFragment, ReactPortal, useEffect, useState } from 'react';
+import {
+  JSXElementConstructor,
+  Key,
+  ReactElement,
+  ReactFragment,
+  ReactPortal,
+  useContext,
+  useEffect,
+  useState,
+} from 'react';
 
 const supabase = createClient(
   'https://niwaazauwnrwiwmnocnn.supabase.co',
@@ -52,9 +64,12 @@ const initialList = [
 ];
 
 export default function Page() {
+  const pool: any = useContext(RelayContext);
+
   const router = useRouter();
   const { id, privkey }: any = router.query;
 
+  const [relays] = useAtom(relaysAtom);
   const [loading, setLoading] = useState(false);
   const [list, setList]: any = useState(initialList);
   const [follows, setFollows] = useState([]);
@@ -93,13 +108,9 @@ export default function Page() {
     createFollows(follows, id, 0)
       .then((res) => {
         if (res === 'ok') {
-          getAllRelays()
-            .then((res) => {
-              // publish to relays
-              pool(res).publish(event, res);
-              router.push('/');
-            })
-            .catch(console.error);
+          // publish to relays
+          pool.publish(event, relays);
+          router.push('/');
         }
       })
       .catch(console.error);