refactor: only reset bridge state if active quote is not present

MetaMask · Dec 20, 2024 · dd7b471 · dd7b471
1 parent ee39ed1
commit dd7b471
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -217,9 +217,6 @@ const PrepareBridgePage = () => {
   }, [rotateSwitchTokens]);
 
   useEffect(() => {
-    // Reset controller and inputs on load
-    dispatch(resetBridgeState());
-
     if (activeQuote) {
       // Get input data from active quote
       const { srcAsset, destAsset, destChainId } = activeQuote.quote;
@@ -229,6 +226,7 @@ const PrepareBridgePage = () => {
 
       if (quoteSrcToken && quoteDestToken && quoteDestChainId) {
         // Set inputs to values from active quote
+        dispatch(setFromTokenInputValue(null));
         dispatch(
           setFromToken({ ...quoteSrcToken, image: quoteSrcToken.iconUrl }),
         );
@@ -237,6 +235,9 @@ const PrepareBridgePage = () => {
           setToToken({ ...quoteDestToken, image: quoteDestToken.iconUrl }),
         );
       }
+    } else {
+      // Reset controller and inputs on load
+      dispatch(resetBridgeState());
     }
   }, []);