Merge pull request #75 from eosdac/v0.4.5_rc1

Fixing Lynx bug
eosdac · Jul 12, 2019 · c7ad545 · c7ad545
2 parents 5184916 + 7c9d387
commit c7ad545
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "eosdacmemberclient",
-  "version": "0.4.4",
+  "version": "0.4.5",
+  "license": "MIT",
   "local_storage_version": "0.1",
   "description": "Toolkit GUI for eosDAC",
   "productName": "eosDAC Member Client",
@@ -16,7 +17,7 @@
     "@chenfengyuan/vue-countdown": "^1.1.2",
     "@scatterjs/core": "^2.7.26",
     "@scatterjs/eosjs2": "^1.5.8",
-    "@scatterjs/lynx": "^1.6.17",
+    "@scatterjs/lynx": "^1.6.20",
     "axios": "^0.19.0",
     "chart.js": "^2.8.0",
     "connect": "^3.6.6",

diff --git a/src/index.template.html b/src/index.template.html
@@ -25,36 +25,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="<%= htmlWebpackPlugin.options.host %>/branding/images/icons/favicon-32x32.png?v=2">
     <link rel="icon" type="image/png" sizes="16x16" href="<%= htmlWebpackPlugin.options.host %>/branding/images/icons/favicon-16x16.png?v=2">
     <link rel="icon" href="<%= htmlWebpackPlugin.options.host %>/branding/images/social_share_preview/mockup-social-media-client-facebook-1200x630.png" sizes="1200x630" />
-    <script>
-      //debug code for eoslynx.... this will be deleted when it isn't needed anymore. can be savely removed!
-    // window.lynxMobile = {
-    //         requestSetAccountName:x => {
-    //           const accounts = [{
-    //             name:'testaccount1',
-    //             authority:'active',
-    //             publicKey:'EOS5Jzkpde9pDNTPjyWqcHwvNkrXQma8VPV9qZ3fNu5dvZkiLEKxG',
-    //             blockchain:'eos',
-    //             isHardware:false,
-    //             chainId:'EOS5Jzkpde9pDNTPjyWqcHwvNkrXQma8VPV9qZ3fNu5dvZkiLEKxG'
-    //           }];
 
-    //           const identity = {
-    //             name:accounts[0].name,
-    //             accounts,
-    //             publicKey:'EOS8RFgis6KAbChv89L3ibPmSH9raqN3iaFWbyLrDgmAuV3rsZ9SM'
-    //           };
-
-    //           ScatterJS.scatter.identity = identity;
-    //           console.log(ScatterJS.scatter.identity);
-    //           return identity;
-    //         },
-    //     requestSetAccount:name => {},
-    //         requestArbitrarySignature:x => { console.log(x); },
-    //     requestSignature:x => { console.log(x); }
-    //   };
-
-
-    </script>
   </head>
   <body>
     <!-- DO NOT touch the following DIV -->

diff --git a/yarn.lock b/yarn.lock
@@ -757,17 +757,27 @@
     isomorphic-ws "^4.0.1"
     ws "^6.1.0"
 
+"@scatterjs/core@^2.7.27":
+  version "2.7.27"
+  resolved "https://registry.yarnpkg.com/@scatterjs/core/-/core-2.7.27.tgz#6a9bf58ee93572def5b0165788d5816fcb5da1f1"
+  dependencies:
+    create-hash "^1.2.0"
+    es6-promise "^4.2.4"
+    get-random-values "^1.2.0"
+    isomorphic-ws "^4.0.1"
+    ws "^6.1.0"
+
 "@scatterjs/eosjs2@^1.5.8":
   version "1.5.8"
   resolved "https://registry.yarnpkg.com/@scatterjs/eosjs2/-/eosjs2-1.5.8.tgz#d02377189011cd5b88c4df034b09b055c0b1c645"
   dependencies:
     "@scatterjs/core" "^2.7.26"
 
-"@scatterjs/lynx@^1.6.17":
-  version "1.6.17"
-  resolved "https://registry.yarnpkg.com/@scatterjs/lynx/-/lynx-1.6.17.tgz#11892c6209a25ad2785c42700553b4c48599689e"
+"@scatterjs/lynx@^1.6.20":
+  version "1.6.20"
+  resolved "https://registry.yarnpkg.com/@scatterjs/lynx/-/lynx-1.6.20.tgz#8b07444aab3464badd264ba8d4980d08e68ebad0"
   dependencies:
-    "@scatterjs/core" "^2.7.26"
+    "@scatterjs/core" "^2.7.27"
 
 "@types/q@^1.5.1":
   version "1.5.2"