eosjs 16.0.0 compat fix

eosrio · Aug 1, 2018 · 88d2530 · 88d2530
1 parent 40f55b0
commit 88d2530
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/ng-dist/main.js b/ng-dist/main.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simpleos",
-  "version": "0.6.3",
+  "version": "0.6.3-2",
   "productName": "simpleos",
   "description": "EOS Blockchain Interface & Wallet",
   "author": {

diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
@@ -65,7 +65,7 @@
           <fa-icon [icon]="['fas', 'heart']"></fa-icon>
           by <a style="color: #d7d7d7;" [routerLink]="['about']">EOS Rio</a>
         </div>
-        <div class="version">v0.6.3</div>
+        <div class="version">v0.6.3-2</div>
       </section>
     </nav>
   </div>

diff --git a/src/app/dashboard/send/send.component.html b/src/app/dashboard/send/send.component.html
@@ -1,4 +1,4 @@
-<toaster-container [toasterconfig]="config"></toaster-container>
+<!--<toaster-container [toasterconfig]="config"></toaster-container>-->
 <div class="container-fluid" style="overflow:hidden;">
   <div class="row flex-items-xs-between send-row">
     <div class="col-md-6 text-center animate" style="align-self: center;">

diff --git a/src/app/dashboard/vote/vote.component.html b/src/app/dashboard/vote/vote.component.html
@@ -1,4 +1,4 @@
-<toaster-container [toasterconfig]="config"></toaster-container>
+<!--<toaster-container [toasterconfig]="config"></toaster-container>-->
 <div class="container" style="height: 100%; overflow-x: hidden;">
   <div class="row animate" style="padding-top: 15px;">
     <div class="col-lg-6">

diff --git a/src/app/dashboard/vote/vote.component.ts b/src/app/dashboard/vote/vote.component.ts
@@ -205,6 +205,7 @@ export class VoteComponent implements OnInit, AfterViewInit {
     this.busy = true;
     const account = this.aService.selected.getValue();
     const pubkey = account.details['permissions'][0]['required_auth'].keys[0].key;
+    console.log(pubkey);
     this.crypto.authenticate(password, pubkey).then((data) => {
       if (data === true) {
         let call;

diff --git a/src/app/eosjs.service.ts b/src/app/eosjs.service.ts
@@ -45,7 +45,9 @@ export class EOSJSService {
   reloadInstance() {
     this.auth = true;
     this.eos = EOSJS(this.baseConfig);
-    this.baseConfig.keyProvider = [];
+    setTimeout(() => {
+      this.baseConfig.keyProvider = [];
+    }, 1000);
   }
 
   clearInstance() {

diff --git a/src/app/services/crypto.service.ts b/src/app/services/crypto.service.ts
@@ -151,7 +151,8 @@ export class CryptoService {
           name: 'AES-GCM',
           iv: iv
         }, this.masterKey, data);
-        this.eosjs.baseConfig.keyProvider.push(String.fromCharCode.apply(null, new Uint8Array(decrypted)).replace(/"/g, ''));
+        const decryptedKey = String.fromCharCode.apply(null, new Uint8Array(decrypted));
+        this.eosjs.baseConfig.keyProvider = decryptedKey.replace(/^"(.+(?="$))"$/, '$1');
         this.eosjs.reloadInstance();
         return true;
       } else {