Merge pull request #157 from alleslabs/fix/chain-path

Fix/chain path
alleslabs · Feb 7, 2023 · 2a105c9 · 2a105c9 · vercel · Feb 7, 2023
2 parents 50897d1 + e299620
commit 2a105c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -126,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#157](https://github.com/alleslabs/celatone-frontend/pull/157) Fix chain path bug when mixed up with query params
 - [#154](https://github.com/alleslabs/celatone-frontend/pull/154) Stay on the same contract list page after renaming the list
 - [#155](https://github.com/alleslabs/celatone-frontend/pull/155) Fix uncontrolled input error and fix space bar issue in editable cell
 - [#156](https://github.com/alleslabs/celatone-frontend/pull/156) Fix json editor cannot focus by clicking on empty area

diff --git a/src/lib/layout/Header.tsx b/src/lib/layout/Header.tsx
@@ -35,11 +35,12 @@ const Header = () => {
       if (chainName === currentChainName) return;
       setCurrentChain(chainName);
       navigate({
-        pathname: router.asPath.replace(`/${router.query.network}`, ""),
+        pathname: router.pathname.replace("/[network]", ""),
         query: {
           /**
            * @remarks Condition checking varies by chain
            */
+          ...router.query,
           network: getNetworkByChainName(chainName),
         },
       });