update hooks to use prop conditional when fetching new output

helium · Oct 30, 2024 · a0aa4b6 · a0aa4b6
1 parent 3f140fa
commit a0aa4b6
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/features/swaps/SwapScreen.tsx b/src/features/swaps/SwapScreen.tsx
@@ -478,32 +478,43 @@ const SwapScreen = () => {
     ],
   )
 
+  useEffect(() => {
+    setRecipient('')
+    setRecipientOpen(false)
+    setOutputAmount(0)
+  }, [
+    inputMint,
+    inputAmount,
+    outputMint,
+    setRecipient,
+    setRecipientOpen,
+    setOutputAmount,
+  ])
+
   useEffect(() => {
     // if changing outputMint ensure we get new routes
     ;(async () => {
       if (
         !isDevnet &&
-        inputMintAcc &&
-        outputMintAcc &&
+        inputMintAcc?.address === inputMint &&
+        outputMintAcc?.address === outputMint &&
         typeof inputAmount !== 'undefined' &&
         inputAmount > 0 &&
         !outputMintAcc?.address.equals(DC_MINT)
       ) {
-        setRecipient('')
-        setRecipientOpen(false)
         await getOutputAmount({
           balance: toBN(inputAmount || 0, inputMintAcc.decimals),
         })
       }
     })()
   }, [
     getOutputAmount,
+    inputMint,
     inputAmount,
     inputMintAcc,
+    outputMint,
     outputMintAcc,
     isDevnet,
-    setRecipient,
-    setRecipientOpen,
   ])
 
   const getInputAmount = useCallback(