Merge pull request #292 from EdgeApp/matthew/fixEthSwaps

If swap requires a wrap function then correctly use the wrapped address
EdgeApp · Sep 28, 2023 · 4e528ba · 4e528ba
2 parents e3260c3 + 236deba
commit 4e528ba
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/swap/defi/defiUtils.ts b/src/swap/defi/defiUtils.ts
@@ -41,11 +41,14 @@ export const getInOutTokenAddresses = (
     ? undefined
     : allTokens[toTokenId]
 
-  const fromTokenAddress =
-    asMaybe(asContractLocation)(fromToken?.networkLocation)?.contractAddress ??
-    ''
-  const toTokenAddress =
-    asMaybe(asContractLocation)(toToken?.networkLocation)?.contractAddress ?? ''
+  const fromTokenAddress = isFromNativeCurrency
+    ? wrappedMainnetAddress
+    : asMaybe(asContractLocation)(fromToken?.networkLocation)
+        ?.contractAddress ?? ''
+  const toTokenAddress = isToNativeCurrency
+    ? wrappedMainnetAddress
+    : asMaybe(asContractLocation)(toToken?.networkLocation)?.contractAddress ??
+      ''
 
   const isFromWrappedCurrency =
     fromTokenAddress.toLowerCase() === wrappedMainnetAddress.toLowerCase()