Fix conflicts

MyEtherWallet · Jul 31, 2019 · d7aec0e · d7aec0e · mew-bot · Jul 31, 2019
2 parents ada3129 + a3dde46
commit d7aec0e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### Bug
 
 - Custom networks not showing on send offline helper [#1285](https://github.com/MyEtherWallet/MyEtherWallet/pull/1285)
+- Fix webworker error when origin is null [#1273](https://github.com/MyEtherWallet/MyEtherWallet/pull/1273)
 
 ### Devop
 

diff --git a/package-audit.js b/package-audit.js
@@ -1,6 +1,6 @@
 const exec = require('child_process').exec;
 
-//tar package is not applicable to web and waiting for other packages to update
+// tar package is not applicable to web and waiting for other packages to update
 // remove handlebars once keepkey updates their dev dependencies
 const AUDIT_EXCEPTIONS = ['tar', 'js-yaml', 'handlebars'];
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -120,7 +120,7 @@
     "stylelint-config-prettier": "5.2.0",
     "stylelint-config-standard": "18.3.0",
     "trezor-connect": "7.0.5",
-    "u2f-api": "1.1.0",
+    "u2f-api": "1.1.1",
     "uglify-es": "3.3.9",
     "unused-files-webpack-plugin": "3.4.0",
     "uuid": "3.3.2",

diff --git a/src/containers/FooterContainer/FooterContainer.vue b/src/containers/FooterContainer/FooterContainer.vue
@@ -222,7 +222,7 @@ export default {
               to: '/#faqs'
             },
             {
-              text: 'MEWTopia',
+              text: 'MEWtopia',
               href: 'https://www.mewtopia.com'
             },
             {

diff --git a/src/dapps/index.js b/src/dapps/index.js
@@ -49,7 +49,7 @@ const dapps = {
     iconDisabled: secureTransactionHov,
     title: 'dappsMaker.maker_title',
     desc: 'dappsMaker.maker_desc',
-    supportedNetworks: [ETH.name]
+    supportedNetworks: [ETH.name, KOV.name]
   }
 };
 

diff --git a/src/layouts/AccessWalletLayout/components/PasswordModal/PasswordModal.vue b/src/layouts/AccessWalletLayout/components/PasswordModal/PasswordModal.vue
@@ -100,7 +100,7 @@ export default {
     unlockWallet() {
       this.spinner = true;
 
-      if (this.online && window.Worker) {
+      if (this.online && window.Worker && window.origin !== 'null') {
         const worker = new walletWorker();
         const self = this;
         worker.postMessage({

diff --git a/src/layouts/CreateWalletLayout/containers/ByJsonFileContainer/ByJsonFileContainer.vue b/src/layouts/CreateWalletLayout/containers/ByJsonFileContainer/ByJsonFileContainer.vue
@@ -39,9 +39,9 @@
                     :download="name"
                     @click="downloadDone()"
                   >
-                    <span v-if="downloadable">
-                      {{ $t('createWallet.byJsonFileDownloadKeyFile') }}
-                    </span>
+                    <span v-if="downloadable">{{
+                      $t('createWallet.byJsonFileDownloadKeyFile')
+                    }}</span>
                     <div v-if="!downloadable">
                       <i class="fa fa-spinner fa-lg fa-spin" />
                     </div>
@@ -106,7 +106,7 @@ export default {
     ...mapState(['online'])
   },
   mounted() {
-    if (this.online && window.Worker) {
+    if (this.online && window.Worker && window.origin !== 'null') {
       const worker = new walletWorker();
       worker.postMessage({ type: 'createWallet', data: [this.password] });
       worker.onmessage = e => {