Merge pull request MyEtherWallet#3096 from MyEtherWallet/develop

Develop
Toporin · May 14, 2021 · 115947f · 115947f
2 parents 5f5b68f + 4b795a8
commit 115947f
Show file tree

Hide file tree

Showing 6 changed files with 946 additions and 984 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
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
@@ -1,6 +1,6 @@
 {
   "name": "myetherwallet",
-  "version": "5.7.29",
+  "version": "5.7.30",
   "description": "Client side ethereum wallet",
   "scripts": {
     "build:offline": "WEBPACK_INTEGRITY=false npm run build:hash",
@@ -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/layouts/SendOfflineHelper/SendOfflineHelper.vue b/src/layouts/SendOfflineHelper/SendOfflineHelper.vue
@@ -295,7 +295,7 @@
               />
             </div>
             <p
-              v-if="isAddressMatch"
+              v-if="!isAddressMatch"
               class="gas-price-warning signer-mismatch-warning"
             >
               {{ $t('errorsGlobal.signer-mismatch') }}
@@ -451,7 +451,10 @@ export default {
       'gasLimitWarning'
     ]),
     isAddressMatch() {
-      return this.genInfo.address === this.from;
+      return this.from !== '0x' && this.genInfo.address !== '0x'
+        ? web3Utils.toChecksumAddress(this.genInfo.address) ==
+            web3Utils.toChecksumAddress(this.from)
+        : false;
     },
     showGasWarning() {
       return this.gasPrice >= this.gasLimitWarning;

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);