From 1d7f9c0cca9379a5cfdc0f2ab150840861e02780 Mon Sep 17 00:00:00 2001
From: Taylor Helsper <tehelsper@gmail.com>
Date: Wed, 18 Sep 2019 22:13:02 -0500
Subject: [PATCH] Imrpove info on using electrum

---
 CHANGELOG                                     |  3 +
 .../var/www/mynode/electrum_server.py         |  7 ++-
 .../www/mynode/templates/electrum_server.html | 58 +++++++++++++++++--
 .../var/www/mynode/templates/lnd.html         |  2 +-
 4 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0947056a..d49bf7fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+=== v0.1.47 ===
+-  Improve Info on Using Electrum Server
+
 === v0.1.46 ===
 - Improve VPN consistency between device reboots
 - Tweak DNS settings
diff --git a/rootfs/standard/var/www/mynode/electrum_server.py b/rootfs/standard/var/www/mynode/electrum_server.py
index e52f82e4..880e9417 100644
--- a/rootfs/standard/var/www/mynode/electrum_server.py
+++ b/rootfs/standard/var/www/mynode/electrum_server.py
@@ -94,13 +94,17 @@ def electrum_server_page():
 
     # Get Onion URLs
     electrs_onion_hostname = "..."
+    electrs_onion_password = "..."
     electrs_onion_command = "..."
     if os.path.isfile("/var/lib/tor/mynode/hostname"):
         with open("/var/lib/tor/mynode/hostname") as f:
-            electrs_onion_hostname = f.read().strip()
+            contents = f.read().split()
+            electrs_onion_hostname = contents[0]
+            electrs_onion_password = contents[1]
             electrs_onion_command = "./electrum -1 -s {}:50002:s -p socks5:localhost:9050".format(electrs_onion_hostname)
     else:
         electrs_onion_hostname = "disabled"
+        electrs_onion_password = "disabled"
         electrs_onion_command = "disabled"
 
     # Load page
@@ -115,6 +119,7 @@ def electrum_server_page():
         "server_standard_port": server_standard_port,
         "server_secure_port": server_secure_port,
         "electrs_onion_hostname": electrs_onion_hostname,
+        "electrs_onion_password": electrs_onion_password,
         "electrs_onion_command": electrs_onion_command
     }
     return render_template('electrum_server.html', **templateData)
diff --git a/rootfs/standard/var/www/mynode/templates/electrum_server.html b/rootfs/standard/var/www/mynode/templates/electrum_server.html
index 8ca0dd68..0566372d 100644
--- a/rootfs/standard/var/www/mynode/templates/electrum_server.html
+++ b/rootfs/standard/var/www/mynode/templates/electrum_server.html
@@ -47,7 +47,6 @@
             </div>
         </div>
 
-        <!--
         <div class="divider" style="width: 800px;"></div>
 
         <div class="app_tile_row">
@@ -55,11 +54,15 @@
                 <div class="info_tile_header">Electrum Tor Service</div>
                 <div class="info_tile_contents">{% if not product_key_skipped %}Enabled{% else %}Premium Feature{% endif %}</div>
             </div>
-            {% if not product_key_skipped %}
+{% if not product_key_skipped %}
             <div class="info_tile">
                 <div class="info_tile_header">Electrum Tor Hostname</div>
                 <div class="info_tile_contents">{{electrs_onion_hostname}}</div>
             </div>
+            <div class="info_tile">
+                <div class="info_tile_header">Electrum Tor Password</div>
+                <div class="info_tile_contents">{{electrs_onion_password}}</div>
+            </div>
         </div>
         <div class="app_tile_row">
             <div class="info_tile">
@@ -70,9 +73,56 @@
                 <div class="info_tile_header">Electrum Tor Help</div>
                 <div class="info_tile_contents"><a href="http://docs.electrum.org/en/latest/tor.html" target="_blank">Link</a></div>
             </div>
-            {% endif %}
+{% endif %}
+        </div>
+
+        <br/><br/>
+        <div class="main_header">Using Electrum Wallets</div>
+        <div class="main_header_sub_text">
+            You can use your myNode to serve your mobile and PC-based Electrum clients securely and remotely!
+        </div>
+        <div class="app_tile_row">
+            <div class="app_tile_short">
+                <div class="app_status_icon"></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/electrum_logo.png")}}"/></div>
+                <div class="app_title">Local<br/>PC Wallet</div>
+                <div class="app_status"></div>
+                <div class="app_contents">
+                        <a class="ui-button ui-widget ui-corner-all mynode_button" href="https://mynodebtc.com/guide/electrum_server" target="_blank">Guide</a>
+                </div>
+            </div>
+
+            <div class="app_tile_short">
+                <div class="app_status_icon"></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/electrum_logo.png")}}"/></div>
+                <div class="app_title">Local<br/>Mobile Wallets</div>
+                <div class="app_status"></div>
+                <div class="app_contents">
+                    <a class="ui-button ui-widget ui-corner-all mynode_button" href="https://mynodebtc.com/guide/electrum_server" target="_blank">Guide</a>
+                </div>
+            </div>
+
+            <div class="app_tile_short">
+                <div class="app_status_icon"></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/tor.png")}}"/></div>
+                <div class="app_title">Remote<br/>PC Wallet</div>
+                <div class="app_status"></div>
+                <div class="app_contents">
+                    <a class="ui-button ui-widget ui-corner-all mynode_button" href="https://mynodebtc.com/guide/electrum_server_tor" target="_blank">Guide</a>
+                </div>
+            </div>
+
+            <div class="app_tile_short">
+                <div class="app_status_icon"></div>
+                <div class="app_logo"><img class="app_logo_icon" src="{{ url_for('static', filename="images/tor.png")}}"/></div>
+                <div class="app_title">Remote<br/>Mobile Wallet</div>
+                <div class="app_status"></div>
+                <div class="app_contents">
+                    <a class="ui-button ui-widget ui-corner-all mynode_button" href="https://mynodebtc.com/guide/electrum_server_tor" target="_blank">Guide</a>
+                </div>
+            </div>
+
         </div>
-        -->
 
         {% include 'includes/footer.html' %}
      </body>
diff --git a/rootfs/standard/var/www/mynode/templates/lnd.html b/rootfs/standard/var/www/mynode/templates/lnd.html
index 58670c61..6950a6c5 100644
--- a/rootfs/standard/var/www/mynode/templates/lnd.html
+++ b/rootfs/standard/var/www/mynode/templates/lnd.html
@@ -236,7 +236,7 @@
 {% endif %}
 
 {% if wallet_exists and wallet_logged_in %}
-    <div class="main_header">Acess your Wallet</div>
+    <div class="main_header">Access your Wallet</div>
         <div class="main_header_sub_text">
             There are numerous ways to access and manage your wallet. Choose any option below!
         </div>