From e48314022cceb053e7eb83c76a81f62ba5bf2ba5 Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Thu, 6 Aug 2020 17:53:11 -0500
Subject: [PATCH] Fix halving message from showing on new device setup

---
 .../includes/main_page_messages.html          | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/rootfs/standard/var/www/mynode/templates/includes/main_page_messages.html b/rootfs/standard/var/www/mynode/templates/includes/main_page_messages.html
index ce7ea485..a240d458 100644
--- a/rootfs/standard/var/www/mynode/templates/includes/main_page_messages.html
+++ b/rootfs/standard/var/www/mynode/templates/includes/main_page_messages.html
@@ -22,28 +22,29 @@
 </div>
 {% endif %}
 
-
-
-{% set blocks_until_halving = 210000 - (current_block % 210000) %}
-{% if blocks_until_halving < 1000 %}
-<div class="halving_message_main_page">
-    <table class="halving_message_table">
-        <tr>
-            <td><img class="halving_image" src="{{ url_for('static', filename='images/stopwatch.png')}}"/></td>
-            <td>{{ blocks_until_halving }} blocks to the halving...</td>
-            <td><img class="halving_image" src="{{ url_for('static', filename='images/timer.png')}}"/></td>
-        </tr>
-    </table>
-</div>
-{% endif %}
-{% if blocks_until_halving > 209400 %}
-<div class="halving_message_main_page">
-    <table class="halving_message_table">
-        <tr>
-            <td><img class="halving_image" src="{{ url_for('static', filename='images/fireworks1.png')}}"/></td>
-            <td>Happy Halving!!!</td>
-            <td><img class="halving_image" src="{{ url_for('static', filename='images/fireworks2.png')}}"/></td>
-        </tr>
-    </table>
-</div>
+<!-- Make sure blocks are syncing, otherwise on startup block 0 may show halving -->
+{% if current_block > 100000 %}
+    {% set blocks_until_halving = 210000 - (current_block % 210000) %}
+    {% if blocks_until_halving < 1000 %}
+    <div class="halving_message_main_page">
+        <table class="halving_message_table">
+            <tr>
+                <td><img class="halving_image" src="{{ url_for('static', filename='images/stopwatch.png')}}"/></td>
+                <td>{{ blocks_until_halving }} blocks to the halving...</td>
+                <td><img class="halving_image" src="{{ url_for('static', filename='images/timer.png')}}"/></td>
+            </tr>
+        </table>
+    </div>
+    {% endif %}
+    {% if blocks_until_halving > 209400 %}
+    <div class="halving_message_main_page">
+        <table class="halving_message_table">
+            <tr>
+                <td><img class="halving_image" src="{{ url_for('static', filename='images/fireworks1.png')}}"/></td>
+                <td>Happy Halving!!!</td>
+                <td><img class="halving_image" src="{{ url_for('static', filename='images/fireworks2.png')}}"/></td>
+            </tr>
+        </table>
+    </div>
+    {% endif %}
 {% endif %}
\ No newline at end of file