From 43ee8ebd378218d852d2ae61893af5eee43b0f3c Mon Sep 17 00:00:00 2001
From: odiseus <20369369+odiseusme@users.noreply.github.com>
Date: Thu, 7 May 2026 10:01:31 +0300
Subject: [PATCH] fix: remove ignoreBuildErrors and resolve typed-route errors
 (#8)

---
 apps/guard/next.config.js    |  3 --
 apps/watcher/next.config.js  |  3 --
 apps/watcher/src/app/App.tsx | 59 ++++++++++++++++++------------------
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/apps/guard/next.config.js b/apps/guard/next.config.js
index 3e72b8a34..a0ded5f60 100644
--- a/apps/guard/next.config.js
+++ b/apps/guard/next.config.js
@@ -5,9 +5,6 @@ const path = require('path');
 const nextConfig = {
   typedRoutes: true,
   output: 'export',
-  typescript: {
-    ignoreBuildErrors: true,
-  },
   staticPageGenerationTimeout: 600,
   env: {
     API_BASE_URL: process.env.API_BASE_URL,
diff --git a/apps/watcher/next.config.js b/apps/watcher/next.config.js
index c4825704f..39d408624 100644
--- a/apps/watcher/next.config.js
+++ b/apps/watcher/next.config.js
@@ -8,9 +8,6 @@ const nextConfig = {
     unoptimized: true,
   },
   output: 'export',
-  typescript: {
-    ignoreBuildErrors: true,
-  },
   staticPageGenerationTimeout: 600,
   env: {
     API_BASE_URL: process.env.API_BASE_URL,
diff --git a/apps/watcher/src/app/App.tsx b/apps/watcher/src/app/App.tsx
index 9e639dec8..89670c4b2 100644
--- a/apps/watcher/src/app/App.tsx
+++ b/apps/watcher/src/app/App.tsx
@@ -1,16 +1,20 @@
 'use client';
 
-import { Route } from 'next';
+import type { Route } from 'next';
+import NextImage from 'next/image';
+import NextLink from 'next/link';
 import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { PropsWithChildren } from 'react';
 
+/**
+ * FIXME: import NoSsr from ui-kit
+ * local:ergo/rosen-bridge/ui#193
+ */
+import { NoSsr } from '@mui/material';
 import {
   App as AppBase,
   ApiKeyProvider,
   FrameworkProvider,
-  ThemeProvider,
-  ToastProvider,
-  NoSsr,
 } from '@rosen-bridge/ui-kit';
 import { mockMiddlewareFactory } from '@rosen-ui/swr-helpers';
 import { SWRConfig } from 'swr';
@@ -18,9 +22,9 @@ import { SWRConfig } from 'swr';
 import { Favicon } from '@/components';
 import { mockedData } from '@/mock/mockedData';
 import { theme } from '@/theme/theme';
-import { UIKitProvider } from '@/uiKitProvider';
 
-import { Sidebar } from './Sidebar';
+import { SideBar } from './SideBar';
+import { Toolbar } from './Toolbar';
 
 export const App = ({ children }: PropsWithChildren) => {
   const pathname = usePathname();
@@ -32,34 +36,31 @@ export const App = ({ children }: PropsWithChildren) => {
   return (
     <NoSsr>
       <FrameworkProvider
+        components={{
+          Anchor: (props) => <NextLink {...props} href={props.href as Route} />,
+          Image: (props) => <NextImage {...props} />,
+        }}
         router={{
           pathname,
           search: searchParams.toString(),
-          push: (href) =>
-            router.push(href as unknown as Route, { scroll: false }),
+          push: (href: string) => router.push(href as Route, { scroll: false }),
         }}
       >
-        <UIKitProvider>
-          <ApiKeyProvider>
-            <ThemeProvider theme={theme}>
-              <ToastProvider>
-                <AppBase sidebar={<Sidebar />}>
-                  <Favicon />
-                  <SWRConfig
-                    value={{
-                      use:
-                        process.env.NEXT_PUBLIC_USE_MOCKED_APIS === 'true'
-                          ? [mockMiddlewareFactory(mockedData)]
-                          : [],
-                    }}
-                  >
-                    {children}
-                  </SWRConfig>
-                </AppBase>
-              </ToastProvider>
-            </ThemeProvider>
-          </ApiKeyProvider>
-        </UIKitProvider>
+        <ApiKeyProvider>
+          <AppBase sideBar={<SideBar />} theme={theme} toolbar={<Toolbar />}>
+            <Favicon />
+            <SWRConfig
+              value={{
+                use:
+                  process.env.NEXT_PUBLIC_USE_MOCKED_APIS === 'true'
+                    ? [mockMiddlewareFactory(mockedData)]
+                    : [],
+              }}
+            >
+              {children}
+            </SWRConfig>
+          </AppBase>
+        </ApiKeyProvider>
       </FrameworkProvider>
     </NoSsr>
   );