improve startup time

src/app/auth/import/step-3.tsx

@@ -16,7 +16,7 @@ export function ImportStep3Screen() {
   const setStep = useOnboarding((state) => state.setStep);
 
   const { db } = useStorage();
-  const { fetchUserData, prefetchEvents } = useNostr();
+  const { fetchUserData } = useNostr();
 
   const [loading, setLoading] = useState(false);
 
@@ -27,16 +27,14 @@ export function ImportStep3Screen() {
 
       // prefetch data
       const user = await fetchUserData();
-      const data = await prefetchEvents();
 
       // create default widget
       await db.createWidget(WidgetKinds.other.learnNostr, 'Learn Nostr', '');
 
       // redirect to next step
-      if (user.status === 'ok' && data.status === 'ok') {
+      if (user.status === 'ok') {
         navigate('/auth/onboarding/step-2', { replace: true });
       } else {
-        console.log('error: ', data.message);
         setLoading(false);
       }
     } catch (e) {
@@ -82,8 +80,8 @@ export function ImportStep3Screen() {
             )}
           </button>
           <span className="text-center text-sm text-white/50">
-            By clicking &apos;Continue&apos;, Lume will download your old relay list and
-            all events from the last 24 hours. It may take a bit
+            By clicking &apos;Continue&apos;, Lume will sync your old relay list and
+            metadata. It may take a bit
           </span>
         </div>
       </div>

src/app/auth/onboarding/step-1.tsx

@@ -16,7 +16,7 @@ export function OnboardStep1Screen() {
   const navigate = useNavigate();
   const setStep = useOnboarding((state) => state.setStep);
 
-  const { publish, fetchUserData, prefetchEvents } = useNostr();
+  const { publish, fetchUserData } = useNostr();
   const { db } = useStorage();
   const { status, data } = useQuery(['trending-profiles-widget'], async () => {
     const res = await fetch('https://api.nostr.band/v0/trending/profiles');
@@ -46,14 +46,12 @@ export function OnboardStep1Screen() {
 
       // prefetch data
       const user = await fetchUserData(follows);
-      const data = await prefetchEvents();
 
       // redirect to next step
-      if (event && user.status === 'ok' && data.status === 'ok') {
+      if (event && user.status === 'ok') {
         navigate('/auth/onboarding/step-2', { replace: true });
       } else {
         setLoading(false);
-        console.log('error: ', data.message);
       }
     } catch (e) {
       setLoading(false);
@@ -70,7 +68,7 @@ export function OnboardStep1Screen() {
     <div className="flex h-full w-full flex-col justify-center">
       <div className="mx-auto mb-4 w-full max-w-md border-b border-white/10 pb-4">
         <h1 className="mb-2 text-center text-2xl font-semibold text-white">
-          {loading ? 'Prefetching data...' : 'Enrich your network'}
+          {loading ? 'Loading...' : 'Enrich your network'}
         </h1>
         <p className="text-white/70">
           Choose the account you want to follow. These accounts are trending in the last
@@ -127,19 +125,12 @@ export function OnboardStep1Screen() {
               </>
             )}
           </button>
-          {!loading ? (
-            <Link
-              to="/auth/onboarding/step-2"
-              className="inline-flex h-12 w-full items-center justify-center rounded-lg border-t border-white/10 bg-white/20 px-6 font-medium leading-none text-white backdrop-blur-xl hover:bg-white/30 focus:outline-none"
-            >
-              Skip, you can add later
-            </Link>
-          ) : (
-            <span className="text-center text-sm text-white/50">
-              By clicking &apos;Continue&apos;, Lume will download all events related to
-              your follows from the last 24 hours. It may take a bit
-            </span>
-          )}
+          <Link
+            to="/auth/onboarding/step-2"
+            className="inline-flex h-12 w-full items-center justify-center rounded-lg border-t border-white/10 bg-white/20 px-6 font-medium leading-none text-white backdrop-blur-xl hover:bg-white/30 focus:outline-none"
+          >
+            Skip, you can add later
+          </Link>
         </div>
       </div>
     </div>

src/app/space/index.tsx

@@ -65,9 +65,9 @@ export function SpaceScreen() {
         case WidgetKinds.nostrBand.trendingNotes:
           return <TrendingNotesWidget key={widget.id} params={widget} />;
         case WidgetKinds.tmp.xfeed:
-          return <XhashtagWidget key={widget.id} params={widget} />;
-        case WidgetKinds.tmp.xhashtag:
           return <XfeedsWidget key={widget.id} params={widget} />;
+        case WidgetKinds.tmp.xhashtag:
+          return <XhashtagWidget key={widget.id} params={widget} />;
         case WidgetKinds.tmp.list:
           return <WidgetList key={widget.id} params={widget} />;
         case WidgetKinds.other.learnNostr:

src/app/splash.tsx

@@ -12,7 +12,7 @@ import { useNostr } from '@utils/hooks/useNostr';
 export function SplashScreen() {
   const { db } = useStorage();
   const { ndk } = useNDK();
-  const { fetchUserData, prefetchEvents } = useNostr();
+  const { fetchUserData } = useNostr();
 
   const [isLoading, setIsLoading] = useState<boolean>(true);
 
@@ -20,27 +20,8 @@ export function SplashScreen() {
     await invoke('close_splashscreen');
   };
 
-  const prefetch = async () => {
-    try {
-      const [user, events] = await Promise.all([fetchUserData(), prefetchEvents()]);
-
-      if (user.status === 'ok' && events.status === 'ok') {
-        // update last login = current time
-        await db.updateLastLogin();
-        // close splash screen and open main app screen
-        await invoke('close_splashscreen');
-      }
-    } catch (e) {
-      setIsLoading(false);
-      await message(e, {
-        title: 'An unexpected error has occurred',
-        type: 'error',
-      });
-    }
-  };
-
   useEffect(() => {
-    async function initial() {
+    async function syncUserData() {
       if (!db.account) {
         await invoke('close_splashscreen');
       } else {
@@ -50,31 +31,47 @@ export function SplashScreen() {
         if (step) {
           await invoke('close_splashscreen');
         } else {
-          console.log('prefetching...');
-          prefetch();
+          try {
+            const userData = await fetchUserData();
+            if (userData.status === 'ok') {
+              // update last login = current time
+              await db.updateLastLogin();
+              // close splash screen and open main app screen
+              await invoke('close_splashscreen');
+            }
+          } catch (e) {
+            setIsLoading(false);
+            await message(e, {
+              title: 'An unexpected error has occurred',
+              type: 'error',
+            });
+          }
         }
       }
     }
 
     if (ndk) {
-      initial();
+      syncUserData();
     }
   }, [ndk, db.account]);
 
   return (
     <div className="relative flex h-screen w-screen items-center justify-center bg-black">
       <div data-tauri-drag-region className="absolute left-0 top-0 z-10 h-11 w-full" />
-      <div className="flex min-h-0 w-full flex-1 items-center justify-center">
+      <div className="flex min-h-0 w-full flex-1 items-center justify-center px-8">
         <div className="flex flex-col items-center justify-center gap-4">
           <LoaderIcon className="h-6 w-6 animate-spin text-white" />
           {isLoading ? (
-            <div className="flex flex-col gap-1 text-center">
+            <div className="flex flex-col gap-2 text-center">
               <h3 className="text-lg font-semibold leading-none text-white">
-                {!ndk ? 'Connecting to relay...' : 'Fetching events from the last login.'}
+                {!ndk ? 'Connecting to relay...' : 'Syncing user data...'}
               </h3>
-              <p className="text-sm text-white/50">
-                This may take a few seconds, please don&apos;t close app.
-              </p>
+              {ndk ? (
+                <p className="text-sm text-white/50">
+                  Ensure all your data is sync across all Nostr clients, it may take a few
+                  seconds, please don&apos;t close app.
+                </p>
+              ) : null}
             </div>
           ) : (
             <div className="mt-2 flex flex-col gap-1 text-center">