reset external account param only when its present in url

galacticcouncil · Jun 28, 2024 · d5f762a · d5f762a
1 parent d5addd7
commit d5f762a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/sections/web3-connect/accounts/Web3ConnectEvmAccount.tsx b/src/sections/web3-connect/accounts/Web3ConnectEvmAccount.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from "@tanstack/react-location"
+import { useNavigate, useSearch } from "@tanstack/react-location"
 import { Button } from "components/Button/Button"
 import { DisplayValue } from "components/DisplayValue/DisplayValue"
 import { Text } from "components/Typography/Text/Text"
@@ -18,6 +18,7 @@ export const Web3ConnectEvmAccount: FC<
   const { account: currentAccount, setAccount, toggle } = useWeb3ConnectStore()
   const { wallet } = useWallet()
   const navigate = useNavigate()
+  const search = useSearch()
 
   const isActive = currentAccount?.address === account.address
 
@@ -33,7 +34,7 @@ export const Web3ConnectEvmAccount: FC<
         onClick={() => {
           setAccount(account)
           toggle()
-          navigate({ search: { account: undefined } })
+          if (search.account) navigate({ search: { account: undefined } })
         }}
       >
         <div

diff --git a/src/sections/web3-connect/accounts/Web3ConnectSubstrateAccount.tsx b/src/sections/web3-connect/accounts/Web3ConnectSubstrateAccount.tsx
@@ -1,13 +1,14 @@
 import { ComponentPropsWithoutRef } from "react"
 import { useWeb3ConnectStore } from "sections/web3-connect/store/useWeb3ConnectStore"
-import { useNavigate } from "@tanstack/react-location"
+import { useNavigate, useSearch } from "@tanstack/react-location"
 import { Web3ConnectAccount } from "./Web3ConnectAccount"
 
 export const Web3ConnectSubstrateAccount: React.FC<
   ComponentPropsWithoutRef<typeof Web3ConnectAccount>
 > = ({ balance, ...account }) => {
   const { account: currentAccount, setAccount, toggle } = useWeb3ConnectStore()
   const navigate = useNavigate()
+  const search = useSearch()
   const isActive = currentAccount?.address === account.address
 
   return (
@@ -18,7 +19,7 @@ export const Web3ConnectSubstrateAccount: React.FC<
       onClick={(account) => {
         setAccount(account)
         toggle()
-        navigate({ search: { account: undefined } })
+        if (search.account) navigate({ search: { account: undefined } })
       }}
     />
   )