Merge pull request #101 from terraswap/feature/ux-improvement

fix: set replace flag to setSearchParams
terraswap · May 12, 2022 · ee6ca1f · ee6ca1f
2 parents 5361ef5 + 14dbe63
commit ee6ca1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/forms/SwapForm.tsx b/src/forms/SwapForm.tsx
@@ -158,7 +158,7 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
     if (!from && !to) {
       setTimeout(() => {
         searchParams.set("from", type === Type.WITHDRAW ? InitLP : ULUNA)
-        setSearchParams(searchParams)
+        setSearchParams(searchParams, { replace: true })
       }, 100)
     }
   }, [from, searchParams, setSearchParams, to, type])
@@ -171,7 +171,7 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
     if (isUnable) {
       searchParams.set("to", "")
     }
-    setSearchParams(searchParams)
+    setSearchParams(searchParams, { replace: true })
   }
   const handleToken2Select = (token: string, isUnable?: boolean) => {
     searchParams.set("to", token)
@@ -181,7 +181,7 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
     if (isUnable) {
       searchParams.set("from", "")
     }
-    setSearchParams(searchParams)
+    setSearchParams(searchParams, { replace: true })
   }
   const handleSwitchToken = () => {
     if (!pairSwitchable) {
@@ -995,7 +995,7 @@ const SwapForm = ({ type, tabs }: { type: Type; tabs: TabViewProps }) => {
               onClick: () => {
                 searchParams.set("to", "")
                 searchParams.set("from", "")
-                setSearchParams(searchParams)
+                setSearchParams(searchParams, { replace: true })
                 resetField(Key.value1)
                 resetField(Key.value2)
                 resetField(Key.feeSymbol)

diff --git a/src/pages/Swap.tsx b/src/pages/Swap.tsx
@@ -36,7 +36,7 @@ const Swap = () => {
         .includes(type)
     ) {
       searchParams.set("type", Type.SWAP)
-      setSearchParams(searchParams)
+      setSearchParams(searchParams, { replace: true })
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [type])