fix: router

ocadotechnology · Dec 11, 2024 · 07d18fd · 07d18fd
1 parent 0b2cbfc
commit 07d18fd
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -64,23 +64,6 @@ const App = <A extends Action = Action, S = unknown>({
   maxTotalSeconds = 60 * 60,
   ...routesProps
 }: AppProps<A, S>): JSX.Element => {
-  let router: ReactNode
-  if (SSR) {
-    if (!path) throw new Error("Running server and path not provided.")
-
-    router = (
-      <StaticRouter location={path}>
-        <Routes path={path} {...routesProps} />
-      </StaticRouter>
-    )
-  } else {
-    router = (
-      <BrowserRouter>
-        <BrowserRoutes {...routesProps} />
-      </BrowserRouter>
-    )
-  }
-
   // TODO: cannot use document during SSR
   // const root = document.getElementById("root") as HTMLElement
 
@@ -115,7 +98,15 @@ const App = <A extends Action = Action, S = unknown>({
             setTotalSeconds(maxTotalSeconds)
           }}
         /> */}
-        {router}
+        {SSR ? (
+          <StaticRouter location={path as string}>
+            <Routes path={path as string} {...routesProps} />
+          </StaticRouter>
+        ) : (
+          <BrowserRouter>
+            <BrowserRoutes {...routesProps} />
+          </BrowserRouter>
+        )}
       </Provider>
     </ThemeProvider>
   )