v1.7.20

Author: adityapk00

bin/printversion.ps1

@@ -1 +1 @@
-echo "VERSION=1.7.16" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+echo "VERSION=1.7.20" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

bin/printversion.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-VERSION="1.7.16"
+VERSION="1.7.20"
 echo "VERSION=$VERSION" >> $GITHUB_ENV

native/Cargo.lock

@@ -15,6 +15,6 @@ default-features = false
 features = ["napi-6"]
 
 [dependencies]
-zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "3533e79c31df8782e50f82516f6f99fe7699aba8" }
+zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "4276057e9fcdc15f3dd5b4aacd12951d3fec3c48" }
 #zecwalletlitelib = { path = "../../zecwallet-light-cli/lib" }
 lazy_static = "1.4.0"

native/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "name": "zecwallet-lite",
   "productName": "Zecwallet Lite",
-  "version": "1.7.16",
+  "version": "1.7.20",
   "private": true,
   "description": "Zecwallet Lite",
   "license": "MIT",
@@ -110,6 +110,9 @@
     "react-start": "node scripts/start.js",
     "neon": "cargo-cp-artifact -nc src/native.node -- cargo build --release --manifest-path native/Cargo.toml --message-format=json-render-diagnostics"
   },
+  "electronmon": {
+    "patterns": ["!native/**"]
+  },
   "eslintConfig": {
     "extends": [
       "react-app",

package.json

@@ -155,6 +155,7 @@ export class Info {
   zecPrice: number;
   encrypted: boolean;
   locked: boolean;
+  walletHeight: number;
 
   constructor() {
     this.testnet = false;
@@ -167,6 +168,7 @@ export class Info {
     this.zecPrice = 0;
     this.encrypted = false;
     this.locked = false;
+    this.walletHeight = 0;
   }
 }
 

src/components/AppState.ts

@@ -282,12 +282,15 @@ class LoadingScreen extends Component<Props & RouteComponentProps, LoadingScreen
           }
 
           if (!isNaN(progress_blocks)) {
+            let batch_progress = (progress_blocks * 100) / ss.total_blocks;
+            if (isNaN(batch_progress)) {
+              batch_progress = 0;
+            }
             const currentStatus = (
               <div>
                 Syncing batch {ss.batch_num} of {ss.batch_total}
                 <br />
-                Batch Progress: {((progress_blocks * 100) / ss.total_blocks).toFixed(2)}%. Total progress:{" "}
-                {progress.toFixed(2)}%.
+                Batch Progress: {batch_progress.toFixed(2)}%. Total progress: {progress.toFixed(2)}%.
                 <br />
                 <br />
                 Please wait... This could take several minutes or hours

src/components/LoadingScreen.tsx

@@ -276,7 +276,7 @@ class Sidebar extends PureComponent<Props & RouteComponentProps, State> {
       openErrorModal(
         "Zecwallet Lite",
         <div className={cstyles.verticalflex}>
-          <div className={cstyles.margintoplarge}>Zecwallet Lite v1.7.16</div>
+          <div className={cstyles.margintoplarge}>Zecwallet Lite v1.7.20</div>
           <div className={cstyles.margintoplarge}>Built with Electron. Copyright (c) 2018-2021, Aditya Kulkarni.</div>
           <div className={cstyles.margintoplarge}>
             The MIT License (MIT) Copyright (c) 2018-2021 Zecwallet
@@ -735,7 +735,7 @@ class Sidebar extends PureComponent<Props & RouteComponentProps, State> {
           {state === "CONNECTED" && (
             <div className={[cstyles.padsmallall, cstyles.margintopsmall, cstyles.blackbg].join(" ")}>
               <i className={[cstyles.green, "fas", "fa-check"].join(" ")} />
-              &nbsp; Connected
+              &nbsp; {info.walletHeight}
             </div>
           )}
           {state === "SYNCING" && (

src/components/Sidebar.tsx

@@ -203,6 +203,9 @@ export default class RPC {
       info.encrypted = encJSON.encrypted;
       info.locked = encJSON.locked;
 
+      const walletHeight = RPC.fetchWalletHeight();
+      info.walletHeight = walletHeight;
+
       return info;
     } catch (err) {
       console.log("Failed to parse info", err);