Replace custom Route type

oasisprotocol · Nov 11, 2022 · 1896adf · 1896adf
1 parent d63ff1b
commit 1896adf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/extension/src/popup/routes.tsx b/extension/src/popup/routes.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
+import { RouteObject } from 'react-router-dom'
 import { App } from 'app'
 import { ConnectDevicePage } from 'app/pages/ConnectDevicePage'
 import { OpenWalletPageWebExtension } from 'app/pages/OpenWalletPage/webextension'
-import { commonRoutes, Route } from '../../../src/commonRoutes'
+import { commonRoutes } from '../../../src/commonRoutes'
 
-export const routes: Route[] = [
+export const routes: RouteObject[] = [
   {
     path: '/*',
     element: <App />,

diff --git a/src/commonRoutes.tsx b/src/commonRoutes.tsx
@@ -1,4 +1,5 @@
 import React, { ReactNode } from 'react'
+import { RouteObject } from 'react-router-dom'
 import { CreateWalletPage } from 'app/pages/CreateWalletPage'
 import { HomePage } from 'app/pages/HomePage'
 import { FromLedger } from 'app/pages/OpenWalletPage/Features/FromLedger'
@@ -11,13 +12,7 @@ import { ActiveDelegationList } from 'app/pages/StakingPage/Features/DelegationL
 import { DebondingDelegationList } from 'app/pages/StakingPage/Features/DelegationList/DebondingDelegationList'
 import { ParaTimes } from 'app/pages/ParaTimesPage'
 
-export type Route = {
-  path: string
-  element: ReactNode
-  children?: Route[]
-}
-
-export const commonRoutes: Route[] = [
+export const commonRoutes: RouteObject[] = [
   {
     path: '',
     element: <HomePage />,

diff --git a/src/routes.tsx b/src/routes.tsx
@@ -1,9 +1,10 @@
 import React from 'react'
+import { RouteObject } from 'react-router-dom'
 import { App } from 'app'
 import { OpenWalletPage } from 'app/pages/OpenWalletPage'
-import { commonRoutes, Route } from './commonRoutes'
+import { commonRoutes } from './commonRoutes'
 
-export const routes: Route[] = [
+export const routes: RouteObject[] = [
   {
     path: '/*',
     element: <App />,