Merge branch 'devop/update-packages' of github.com:MyEtherWallet/MyEt…

…herWallet into feature/ipfs
bobu4 · Jun 4, 2020 · 998551d · 998551d
2 parents ad184dd + e5924a3
commit 998551d
Show file tree

Hide file tree

Showing 56 changed files with 2,225 additions and 445 deletions.
diff --git a/.github/workflows/deploy-live.yml b/.github/workflows/deploy-live.yml
@@ -54,7 +54,7 @@ jobs:
           TAG=${{ steps.get_release_tag.outputs.VERSION }}
           RELEASE=${TAG//v/}
           sentry-cli releases new -p myetherwallet $RELEASE
-          sentry-cli releases files $RELEASE upload-sourcemaps ./dist/sourcemaps
+          sentry-cli releases -p myetherwallet files $RELEASE upload-sourcemaps ./dist/sourcemaps --url-prefix 'https://www.myetherwallet.com/sourcemaps' --rewrite --validate
           sentry-cli releases set-commits $RELEASE --auto
           sentry-cli releases finalize $RELEASE
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+### Release v5.6.4
+
+### Feature
+
+- Unstoppable domains combined [#2353](https://github.com/MyEtherWallet/MyEtherWallet/pull/2353)
+
+### Devop
+
+- Modify Simplex order flow [#2409](https://github.com/MyEtherWallet/MyEtherWallet/pull/2409)
+
+### Bug
+
+- Also display token icon if submitted and is not found in the masterfile [#2404](https://github.com/MyEtherWallet/MyEtherWallet/pull/2404)
+- Sentry fixes s [#2406](https://github.com/MyEtherWallet/MyEtherWallet/pull/2406)
+- Sentry fixes k [#2411](https://github.com/MyEtherWallet/MyEtherWallet/pull/2411)
+
 ### Release v5.6.3
 
 ### Bug

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-test.js b/package-test.js
@@ -29,7 +29,9 @@ const EXCEPTIONS = [
   'web3-core-helpers',
   'web3-core-method',
   'web3-core-requestmanager',
-  'web3-utils'
+  'web3-utils',
+  '@makerdao/dai-plugin-migrations',
+  'i18n-iso-countries'
 ];
 const CUSTOM_DIST = {
   ['babel-core']: 'bridge'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myetherwallet",
-  "version": "5.6.3",
+  "version": "5.6.4",
   "description": "Client side ethereum wallet",
   "scripts": {
     "build:offline": "WEBPACK_INTEGRITY=false npm run build:hash",
@@ -34,8 +34,8 @@
     "@coolwallets/eth": "0.2.0-beta.1",
     "@coolwallets/transport-web-ble": "0.1.0",
     "@coolwallets/wallet": "0.2.0-beta.1",
-    "@sentry/browser": "5.15.5",
-    "@sentry/integrations": "5.15.5",
+    "@sentry/browser": "5.16.0",
+    "@sentry/integrations": "5.16.0",
     "@unstoppabledomains/resolution": "1.3.6",
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
@@ -106,7 +106,7 @@
     "bignumber.js": "9.0.0",
     "bip39": "3.0.2",
     "bitbox02-api": "0.5.0",
-    "bootstrap-vue": "2.14.0",
+    "bootstrap-vue": "2.15.0",
     "codecov": "3.7.0",
     "copy-webpack-plugin": "6.0.1",
     "detectrtc": "1.4.0",
@@ -150,7 +150,7 @@
     "u2f-api": "1.1.1",
     "uglify-es": "3.3.9",
     "uuid": "8.1.0",
-    "vue-i18n": "8.17.7",
+    "vue-i18n": "8.18.1",
     "vue-stripe-elements-plus": "0.3.2",
     "vue-template-compiler": "2.6.11",
     "vue-worker": "1.2.1",

diff --git a/release.sh b/release.sh
@@ -13,7 +13,8 @@ if [ -n "$4" ]; then
     done
 fi
 
-sha256sum * > ../release/MyEtherWallet-$RELEASE-CHECKSUM-SHA256; sha256sum * >  ../release/MEW-CX-$RELEASE-CHECKSUM-SHA256;
+sha256sum ./release/MyEtherWallet-$RELEASE.zip > ./release/MyEtherWallet-$RELEASE-CHECKSUM-SHA256
+sha256sum ./release/MEW-CX-$RELEASE.zip > ./release/MEW-CX-$RELEASE-CHECKSUM-SHA256
 
 GH_API="https://api.github.com"
 GH_REPO="$GH_API/repos/$REPO"

diff --git a/src/builds/mewcx/cxHelpers/cxWeb3.js b/src/builds/mewcx/cxHelpers/cxWeb3.js
@@ -7,12 +7,9 @@ if (
   (window.hasOwnProperty('ethereum') && window.ethereum)
 ) {
   if (
-    window.web3.currentProvider.isMew ||
-    window.ethereum.currentProvider.isMew
+    (window.web3 && window.web3.currentProvider.isMew) ||
+    (window.ethereum && window.ethereum.isMew)
   ) {
-    //     const event = new CustomEvent(
-    //   WEB3_DETECTED.replace('{{id}}', window.extensionID)
-    // );
     window.dispatchEvent(event);
   }
 } else {

diff --git a/src/containers/ConfirmationContainer/ConfirmationContainer.vue b/src/containers/ConfirmationContainer/ConfirmationContainer.vue
@@ -298,8 +298,12 @@ export default {
         this.confirmationCollectionModalOpen();
         if (this.account.identifier !== WEB3_WALLET) {
           for (let i = 0; i < tx.length; i++) {
-            const _signedTx = await this.wallet.signTransaction(tx[i]);
-            signed.push(_signedTx);
+            try {
+              const _signedTx = await this.wallet.signTransaction(tx[i]);
+              signed.push(_signedTx);
+            } catch (err) {
+              this.wallet.errorHandler(err);
+            }
           }
           this.signedArray = signed;
         } else {