router refactor (#781)

rainbow-me · Jul 26, 2023 · 5b2f06c · 5b2f06c
1 parent 76cfddf
commit 5b2f06c
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 125 deletions.
diff --git a/e2e/parallel/vitest.config.ts b/e2e/parallel/vitest.config.ts
@@ -7,6 +7,7 @@ export default mergeConfig(
   viteConfig,
   defineConfig({
     test: {
+      bail: 1,
       threads: false,
     },
   }) as UserConfig,

diff --git a/e2e/serial/vitest.config.ts b/e2e/serial/vitest.config.ts
@@ -8,6 +8,7 @@ export default mergeConfig(
   defineConfig({
     test: {
       threads: false,
+      bail: 1,
       sequence: {
         shuffle: false,
         sequencer: class Sequencer {

diff --git a/e2e/vitest.config.ts b/e2e/vitest.config.ts
@@ -7,5 +7,6 @@ export default defineConfig({
     testTimeout: 90_000,
     watch: false,
     retry: 2,
+    bail: 1,
   },
 }) as UserConfig;
diff --git a/src/entries/popup/App.tsx b/src/entries/popup/App.tsx
@@ -1,7 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
 import * as React from 'react';
-import { HashRouter } from 'react-router-dom';
 import { WagmiConfig } from 'wagmi';
 
 import { analytics } from '~/analytics';
@@ -18,14 +16,10 @@ import { useCurrentThemeStore } from '~/core/state/currentSettings/currentTheme'
 import { POPUP_DIMENSIONS } from '~/core/utils/dimensions';
 import { createWagmiClient } from '~/core/wagmi';
 import { Box, ThemeProvider } from '~/design-system';
-import { Alert } from '~/design-system/components/Alert/Alert';
 
 import { Routes } from './Routes';
-import { CommandK } from './components/CommandK/CommandK';
 import { HWRequestListener } from './components/HWRequestListener/HWRequestListener';
 import { IdleTimer } from './components/IdleTimer/IdleTimer';
-import { Toast } from './components/Toast/Toast';
-import { WindowStroke } from './components/WindowStroke/WindowStroke';
 import { AuthProvider } from './hooks/useAuth';
 import { useIsFullScreen } from './hooks/useIsFullScreen';
 import { PlaygroundComponents } from './pages/_playgrounds';
@@ -86,14 +80,7 @@ export function App() {
                       : undefined,
                   }}
                 >
-                  <HashRouter>
-                    <Routes>
-                      <CommandK />
-                      <Toast />
-                      <Alert />
-                      <WindowStroke />
-                    </Routes>
-                  </HashRouter>
+                  <Routes />
                 </Box>
                 <IdleTimer />
               </AuthProvider>