Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: selected chain 404 #546

Merged
merged 2 commits into from
Sep 26, 2023
+20 −7
Merged

fix: selected chain 404 #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c3aee
fix: selected chain 404
songwongtp Sep 26, 2023
9b81646
fix: add comment
songwongtp Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#546](https://github.com/alleslabs/celatone-frontend/pull/546) Handle 404 on the current selected chain
- [#540](https://github.com/alleslabs/celatone-frontend/pull/540) Add open proposal configuration
- [#532](https://github.com/alleslabs/celatone-frontend/pull/532) Implement new Amplitude structure
- [#538](https://github.com/alleslabs/celatone-frontend/pull/538) Add empty state in query and execute with json schema
Expand Down
26 changes: 19 additions & 7 deletions src/lib/app-provider/hooks/useNetworkChange.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ export const useNetworkChange = (
const navigate = useInternalNavigate();

useEffect(() => {
const networkRoute = router.query.network
? getFirstQueryParam(router.query.network, DEFAULT_SUPPORTED_CHAIN_ID)
: router.asPath.split("/")[1];

if (router.isReady || router.pathname === "/404") {
if (router.isReady) {
const networkRoute = getFirstQueryParam(router.query.network);
// Redirect to default chain if there is no network query provided
if (!router.query.network) {
navigate({
Expand All @@ -30,14 +27,29 @@ export const useNetworkChange = (
router.pathname === "/[network]" &&
!SUPPORTED_CHAIN_IDS.includes(networkRoute)
) {
// Redirect to default network 404 if `/invalid_network`
navigate({
pathname: "/",
replace: true,
pathname: "/404",
query: {
network: DEFAULT_SUPPORTED_CHAIN_ID,
},
});
} else if (networkRoute !== networkRef.current) {
networkRef.current = networkRoute;
handleOnChainIdChange(networkRoute);
}
} else if (router.pathname === "/404") {
const networkRoute = router.asPath.split("/")[1];
// Redirect to the current network 404 if `/current_network/random_path`
// If the current network is also invalid, redicrect to default network 404
navigate({
pathname: "/404",
query: {
network: SUPPORTED_CHAIN_IDS.includes(networkRoute)
? networkRoute
: DEFAULT_SUPPORTED_CHAIN_ID,
},
});
}
}, [
handleOnChainIdChange,
Expand Down