diff --git a/src/app/onboarding/create/[...slug]/page.tsx b/src/app/onboarding/create/[...slug]/page.tsx index 0ec392c0..60f84f2a 100644 --- a/src/app/onboarding/create/[...slug]/page.tsx +++ b/src/app/onboarding/create/[...slug]/page.tsx @@ -167,7 +167,7 @@ export default function Page({ params }: { params: { slug: string } }) { > ) : ( - Done → + Done! Go to newsfeed )} diff --git a/src/app/onboarding/login/[privkey]/page.tsx b/src/app/onboarding/login/[privkey]/page.tsx index 74353527..430bfd13 100644 --- a/src/app/onboarding/login/[privkey]/page.tsx +++ b/src/app/onboarding/login/[privkey]/page.tsx @@ -10,16 +10,14 @@ import { createAccount, createPleb, updateAccount } from '@utils/storage'; import { nip02ToArray } from '@utils/transform'; import Image from 'next/image'; -import { useRouter } from 'next/navigation'; +import Link from 'next/link'; import { getPublicKey } from 'nostr-tools'; import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; export default function Page({ params }: { params: { privkey: string } }) { - const router = useRouter(); - const [pool, relays]: any = useContext(RelayContext); const pubkey = useMemo(() => (params.privkey ? getPublicKey(params.privkey) : null), [params.privkey]); - const eose = useRef(0); + const timeout = useRef(null); const [profile, setProfile] = useState({ metadata: null }); const [done, setDone] = useState(false); @@ -60,7 +58,7 @@ export default function Page({ params }: { params: { privkey: string } }) { }, undefined, () => { - setDone(true); + timeout.current = setTimeout(() => setDone(true), 5000); }, { unsubscribeOnEose: true, @@ -70,14 +68,10 @@ export default function Page({ params }: { params: { privkey: string } }) { return () => { unsubscribe; + clearTimeout(timeout.current); }; }, [pool, relays, pubkey, params.privkey, createPlebs]); - // submit then redirect to home - const submit = () => { - router.replace('/'); - }; - return (
@@ -131,12 +125,13 @@ export default function Page({ params }: { params: { privkey: string } }) { > ) : ( - + Done! Go to newsfeed + )}
diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/page.tsx index 8eaa7636..7a84b156 100644 --- a/src/app/onboarding/page.tsx +++ b/src/app/onboarding/page.tsx @@ -108,6 +108,7 @@ export default function Page() {
@@ -115,6 +116,7 @@ export default function Page() { diff --git a/src/app/page.tsx b/src/app/page.tsx index 6497b23c..7e645ee0 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -27,7 +27,7 @@ export default function Page() { const [lastLogin] = useLocalStorage('lastLogin', new Date()); const now = useRef(new Date()); - const eose = useRef(0); + const timeout = useRef(null); const unsubscribe = useRef(null); const fetchData = useCallback( @@ -119,7 +119,7 @@ export default function Page() { }, undefined, () => { - router.replace('/nostr/newsfeed/following'); + timeout.current = setTimeout(() => router.replace('/nostr/newsfeed/following'), 5000); }, { unsubscribeOnEose: true, @@ -157,6 +157,7 @@ export default function Page() { if (unsubscribe.current) { unsubscribe.current(); } + clearTimeout(timeout.current); }; }, [fetchData, router]); diff --git a/src/components/activeLink.tsx b/src/components/activeLink.tsx index e215c144..510b8dcb 100644 --- a/src/components/activeLink.tsx +++ b/src/components/activeLink.tsx @@ -18,7 +18,7 @@ export const ActiveLink = ({ const isActive = href.includes(segments[1]); return ( - + {children} ); diff --git a/src/components/multiAccounts/index.tsx b/src/components/multiAccounts/index.tsx index 208981c5..853b1623 100644 --- a/src/components/multiAccounts/index.tsx +++ b/src/components/multiAccounts/index.tsx @@ -39,6 +39,7 @@ export default function MultiAccounts() {
@@ -46,6 +47,7 @@ export default function MultiAccounts() {
{users.map((user) => renderAccount(user))}