Merge pull request MyEtherWallet#3094 from MyEtherWallet/bug/fix-toke…

…nAddress-retrieval bug: fix address property checks for one inch
Toporin · May 14, 2021 · 1c4cfb5 · 1c4cfb5
2 parents 481619a + f0cceec
commit 1c4cfb5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Bug
+* fix address property checks for one inch[#3094](https://github.com/MyEtherWallet/MyEtherWallet/pull/3094)
+
+
 ### Release v5.7.29
 
 ### Devop

diff --git a/fetchLists/lists/tokens.json b/fetchLists/lists/tokens.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -82,9 +82,9 @@
     "@ensdomains/dnsregistrar": "0.4.0",
     "@ethereum-alarm-clock/lib": "0.3.5",
     "@keepkey/keepkey.js": "1.2.3",
-    "@ledgerhq/hw-app-eth": "5.50.0",
+    "@ledgerhq/hw-app-eth": "5.51.1",
     "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated",
-    "@ledgerhq/hw-transport-webusb": "5.50.0",
+    "@ledgerhq/hw-transport-webusb": "5.51.1",
     "@makerdao/currency": "0.9.9",
     "@makerdao/dai": "0.29.0",
     "@makerdao/dai-plugin-config": "0.2.15",

diff --git a/src/partners/oneInch/oneInch.js b/src/partners/oneInch/oneInch.js
@@ -339,12 +339,14 @@ export default class OneInch {
   getTokenAddress(token) {
     try {
       if (utils.stringEqual(networkSymbols.ETH, token)) {
-        return this.EthereumTokens[token].contractAddress
-          ? this.EthereumTokens[token].contractAddress
-          : this.tokenDetails[token].address;
+        return this.tokenDetails[token]?.address
+          ? this.tokenDetails[token].address
+          : this.EthereumTokens[token].contractAddress;
       }
       return this.web3.utils.toChecksumAddress(
-        this.EthereumTokens[token].contractAddress
+        this.tokenDetails[token]?.address
+          ? this.tokenDetails[token].address
+          : this.EthereumTokens[token].contractAddress
       );
     } catch (e) {
       errorLogger(e);