1
1
import React from "react" ;
2
- import { BrowserRouter , Route , Routes } from "react-router-dom" ;
2
+ import { BrowserRouter , Navigate , Route , Routes } from "react-router-dom" ;
3
3
import CreateProposalScreen from "../components/CreateProposalScreen/CreateProposalScreen" ;
4
4
import DummyScreen from "../components/DummyScreen/DummyScreen" ;
5
5
import ErrorView , { ErrorType } from "../components/ErrorView/ErrorView" ;
6
6
import OverviewScreen from "../components/OverviewScreen/OverviewScreen" ;
7
7
import PortfolioScreen from "../components/PortfolioScreen/PortfolioScreen" ;
8
- import ProposalDetailScreen from "../components/ProposalDetailScreen/ProposalDetailScreen" ;
9
8
import ProposalScreen from "../components/ProposalScreen/ProposalScreen" ;
10
9
import WalletConnectingScreen from "../components/WalletConnectingScreen/WalletConnectingScreen" ;
11
10
import { useWallet , ConnectionStatus } from "../providers/WalletProvider" ;
12
11
import AppScaffold from "../components/AppScaffold/AppScaffold" ;
12
+ import ProposalDetailRouter from "../components/ProposalDetailScreen/ProposalDetailRouter" ;
13
13
import AppRoutes from "./AppRoutes" ;
14
14
15
15
const AppRouter : React . FC = ( ) => {
@@ -26,13 +26,17 @@ const AppRouter: React.FC = () => {
26
26
element = { < CreateProposalScreen /> }
27
27
/>
28
28
< Route
29
- path = { AppRoutes . ProposalDetail }
30
- element = { < ProposalDetailScreen /> }
29
+ path = { ` ${ AppRoutes . ProposalDetail } /*` }
30
+ element = { < ProposalDetailRouter /> }
31
31
/>
32
32
< Route path = { AppRoutes . Portfolio } element = { < PortfolioScreen /> } />
33
33
</ Route >
34
34
35
- < Route path = "*" element = { < ErrorView type = { ErrorType . NotFound } /> } />
35
+ < Route
36
+ path = { AppRoutes . NotFound }
37
+ element = { < ErrorView type = { ErrorType . NotFound } /> }
38
+ />
39
+ < Route path = "*" element = { < Navigate to = { AppRoutes . NotFound } /> } />
36
40
</ Routes >
37
41
38
42
{ wallet . status === ConnectionStatus . Connecting && (
0 commit comments