Merge pull request #11 from ryo-currency/v0.2.0.2

v0.2.0.2 remove sync_pct, back to using is_ready
ryo-currency · Jul 6, 2018 · 2e18d66 · 2e18d66
2 parents a6c357a + e1084b9
commit 2e18d66
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Resources/www/scripts/main.js b/Resources/www/scripts/main.js
@@ -279,14 +279,14 @@ function update_daemon_status(status_json){
         var wallet_height = status['wallet_height']
         var target_height = status['target_height'];
         sync_pct = target_height > 0 ? parseInt(current_height*100/target_height) : 0;
-        //is_ready = status['is_ready'] && current_height >= 137510 && wallet_height >= current_height -1;
-        is_ready = sync_pct == 100;
+        is_ready = status['is_ready'] && current_height >= 137510 && wallet_height >= current_height -1;
+        //is_ready = sync_pct == 100;
         var status_text = "Network: " + daemon_status;
         if(daemon_status == "Connected"){
             if(is_ready){
                 status_text = '<i class="fa fa-rss fa-flip-horizontal"></i>&nbsp;&nbsp;Network synchronized';
-                //status_text += " (Height: " + current_height + ")";
-                status_text += " " + current_height + "/" + target_height + " (<strong>" + sync_pct + "%</strong>)";
+                status_text += " (Height: " + current_height + ")";
+                //status_text += " " + current_height + "/" + target_height + " (<strong>" + sync_pct + "%</strong>)";
                 progress_bar.addClass('progress-bar-success')
                     .removeClass('progress-bar-striped')
                     .removeClass('active')
@@ -296,23 +296,25 @@ function update_daemon_status(status_json){
             }
             else {
                 status_text = '<i class="fa fa-refresh"></i>&nbsp;&nbsp;Synchronizing...';
-                //status_text += " (Height: " + current_height + ")";
-                status_text += " " + current_height + "/" + target_height + " (<strong>" + sync_pct + "%</strong>)";
+                status_text += " (Height: " + current_height + ")";
+                //status_text += " " + current_height + "/" + target_height + " (<strong>" + sync_pct + "%</strong>)";
                 progress_bar.addClass('progress-bar-striped')
                     .addClass('active')
                     .addClass('progress-bar-warning')
                     .removeClass('progress-bar-success')
                     .removeClass('progress-bar-danger');
                 disable_buttons(true);
             }
-            /*
+            //*
             progress_bar.css("width", "100%");
             progress_bar.attr("aria-valuenow", 100);
             progress_bar_text_low.html('');
             progress_bar_text_high.html(status_text);
             progress_bar_text_low.hide();
             progress_bar_text_high.show();
-            */
+            //*/
+
+            /*
             progress_bar_text_low.html(status_text);
             progress_bar_text_high.html(status_text);
 
@@ -343,6 +345,7 @@ function update_daemon_status(status_json){
 
             progress_bar.css("width", sync_pct + "%");
             progress_bar.attr("aria-valuenow", sync_pct);
+            //*/
         }
         else {
             status_text = '<i class="fa fa-flash"></i>&nbsp;&nbsp;Network: ' + daemon_status;

diff --git a/main.py b/main.py
@@ -23,7 +23,7 @@
         ('www/scripts/mustache.min.js', '3258bb61f5b69f33076dd0c91e13ddd2c7fe771882adff9345e90d4ab7c32426'),
         ('www/scripts/jquery.qrcode.min.js', 'f4ccf02b69092819ac24575c717a080c3b6c6d6161f1b8d82bf0bb523075032d'),
         ('www/scripts/utils.js', 'd0c6870ed19c92cd123c7443cb202c7629f9cd6807daed698485fda25214bdb4'),
-        ('www/scripts/main.js', 'e29c8e561bbb689370e2d9a158d79c56495a845e5dae445330fc0b9024cf880e'),
+        ('www/scripts/main.js', '00c77b75d75482241e086fdbad7552b46467960b5d36401d535ec329d1529c5a'),
 
         ('www/css/structure.css', '2272e39fb9a078a13985e3fcacec9ca725e4d77467197b55a0cca0219cadef81'),
         ('www/css/light-theme.css', '58ad4961791523bc259c4794ece88af47170db31eb00cc5f65e2a5289410b226'),

diff --git a/settings/__init__.py b/settings/__init__.py
@@ -15,7 +15,7 @@
 
 USER_AGENT = "Ryo GUI Wallet"
 APP_NAME = "Ryo GUI Wallet"
-VERSION = [0, 2, 0, 1]
+VERSION = [0, 2, 0, 2]
 
 
 if "--testnet" in sys.argv[1:]: