From de9e753a3642d67a391398efa3cab913c66425fa Mon Sep 17 00:00:00 2001
From: CD-Z <github.verify097@passmail.com>
Date: Thu, 9 Oct 2025 17:53:03 +0200
Subject: [PATCH] fix onboarding

---
 App.tsx                              |  3 +-
 src/database/tables/CategoryTable.ts |  1 +
 src/navigators/Main.tsx              | 97 +++++++++++++++-------------
 3 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/App.tsx b/App.tsx
index eef313a9c7..0a996e0b4d 100644
--- a/App.tsx
+++ b/App.tsx
@@ -44,9 +44,10 @@ Notifications.setNotificationHandler({
     };
   },
 });
-createTables();
 
 const App = () => {
+  createTables();
+
   const navigationRef =
     useRef<NavigationContainerRef<RootStackParamList>>(null);
   // Enable React Navigation DevTools in development
diff --git a/src/database/tables/CategoryTable.ts b/src/database/tables/CategoryTable.ts
index cc0c868697..95a62e5b13 100644
--- a/src/database/tables/CategoryTable.ts
+++ b/src/database/tables/CategoryTable.ts
@@ -20,4 +20,5 @@ export const createCategoryDefaultQuery = `
 INSERT INTO Category (id, name, sort) VALUES 
   (1, "${getString('categories.default')}", 1),
   (2, "${getString('categories.local')}", 2)
+  ON CONFLICT (id) DO NOTHING;
 `;
diff --git a/src/navigators/Main.tsx b/src/navigators/Main.tsx
index f7549153fe..c06d721d72 100644
--- a/src/navigators/Main.tsx
+++ b/src/navigators/Main.tsx
@@ -97,58 +97,63 @@ const MainNavigator = ({
     [theme],
   );
 
-  if (!isOnboarded) {
-    return <OnboardingScreen />;
-  }
-
   return (
-    <NavigationContainer<RootStackParamList>
-      ref={ref}
-      theme={NavTheme}
-      onReady={() => {
-        // Hide splash screen when navigation is ready (BottomNavigator loaded)
-        LottieSplashScreen.hide();
-      }}
-      linking={{
-        prefixes: ['lnreader://'],
-        config: {
-          screens: {
-            MoreStack: {
-              screens: {
-                SettingsStack: {
-                  screens: {
-                    RespositorySettings: '/repo/add',
+    <>
+      {isOnboarded ? null : <OnboardingScreen />}
+      <NavigationContainer<RootStackParamList>
+        ref={ref}
+        theme={NavTheme}
+        onReady={() => {
+          // Hide splash screen when navigation is ready (BottomNavigator loaded)
+          LottieSplashScreen.hide();
+        }}
+        linking={{
+          prefixes: ['lnreader://'],
+          config: {
+            screens: {
+              MoreStack: {
+                screens: {
+                  SettingsStack: {
+                    screens: {
+                      RespositorySettings: '/repo/add',
+                    },
                   },
                 },
               },
             },
           },
-        },
-      }}
-    >
-      <LibraryContextProvider>
-        <UpdateContextProvider>
-          {isNewVersion && <NewUpdateDialog newVersion={latestRelease} />}
-          <Stack.Navigator screenOptions={{ headerShown: false }}>
-            <Stack.Screen name="BottomNavigator" component={BottomNavigator} />
-            <Stack.Screen name="ReaderStack" component={ReaderStack} />
-            <Stack.Screen name="MoreStack" component={MoreStack} />
-            <Stack.Screen name="SourceScreen" component={BrowseSourceScreen} />
-            <Stack.Screen name="BrowseMal" component={MalTopNovels} />
-            <Stack.Screen name="BrowseAL" component={AniListTopNovels} />
-            <Stack.Screen name="BrowseSettings" component={BrowseSettings} />
-            <Stack.Screen
-              name="GlobalSearchScreen"
-              component={GlobalSearchScreen}
-            />
-            <Stack.Screen name="Migration" component={Migration} />
-            <Stack.Screen name="SourceNovels" component={SourceNovels} />
-            <Stack.Screen name="MigrateNovel" component={MigrateNovel} />
-            <Stack.Screen name="WebviewScreen" component={WebviewScreen} />
-          </Stack.Navigator>
-        </UpdateContextProvider>
-      </LibraryContextProvider>
-    </NavigationContainer>
+        }}
+      >
+        <LibraryContextProvider>
+          <UpdateContextProvider>
+            {isNewVersion && <NewUpdateDialog newVersion={latestRelease} />}
+            <Stack.Navigator screenOptions={{ headerShown: false }}>
+              <Stack.Screen
+                name="BottomNavigator"
+                component={BottomNavigator}
+              />
+              <Stack.Screen name="ReaderStack" component={ReaderStack} />
+              <Stack.Screen name="MoreStack" component={MoreStack} />
+              <Stack.Screen
+                name="SourceScreen"
+                component={BrowseSourceScreen}
+              />
+              <Stack.Screen name="BrowseMal" component={MalTopNovels} />
+              <Stack.Screen name="BrowseAL" component={AniListTopNovels} />
+              <Stack.Screen name="BrowseSettings" component={BrowseSettings} />
+              <Stack.Screen
+                name="GlobalSearchScreen"
+                component={GlobalSearchScreen}
+              />
+              <Stack.Screen name="Migration" component={Migration} />
+              <Stack.Screen name="SourceNovels" component={SourceNovels} />
+              <Stack.Screen name="MigrateNovel" component={MigrateNovel} />
+              <Stack.Screen name="WebviewScreen" component={WebviewScreen} />
+            </Stack.Navigator>
+          </UpdateContextProvider>
+        </LibraryContextProvider>
+      </NavigationContainer>
+    </>
   );
 };