diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign index cc21836..b0a8b35 100644 Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ diff --git a/account.py b/account.py index fe44113..79d5560 100644 --- a/account.py +++ b/account.py @@ -36,11 +36,14 @@ def hsdConnected(): return False return True -def hsdVersion(): +def hsdVersion(format=True): info = hsd.getInfo() if 'error' in info: return -1 - return float('.'.join(info['version'].split(".")[:2])) + if format: + return float('.'.join(info['version'].split(".")[:2])) + else: + return info['version'] def check_account(cookie: str): if cookie is None: diff --git a/main.py b/main.py index 9b866ce..9ece496 100644 --- a/main.py +++ b/main.py @@ -1078,6 +1078,7 @@ def settings(): if not os.path.exists(".git"): return render_template("settings.html", account=account,sync=account_module.getNodeSync(), wallet_status=account_module.getWalletStatus(), + hsd_version=account_module.hsdVersion(False), error=error,success=success,version="Error") info = gitinfo.get_git_info() branch = info['refs'] @@ -1092,6 +1093,7 @@ def settings(): return render_template("settings.html", account=account,sync=account_module.getNodeSync(), wallet_status=account_module.getWalletStatus(), + hsd_version=account_module.hsdVersion(False), error=error,success=success,version=version) @app.route('/settings/<action>') diff --git a/templates/404.html b/templates/404.html index 9043c5e..fda914e 100644 --- a/templates/404.html +++ b/templates/404.html @@ -74,7 +74,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/auction.html b/templates/auction.html index 11cdf3c..34f2481 100644 --- a/templates/auction.html +++ b/templates/auction.html @@ -106,7 +106,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/auctions.html b/templates/auctions.html index 2491973..8f21112 100644 --- a/templates/auctions.html +++ b/templates/auctions.html @@ -164,7 +164,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/confirm-password.html b/templates/confirm-password.html index 0da1c89..b45aeab 100644 --- a/templates/confirm-password.html +++ b/templates/confirm-password.html @@ -76,7 +76,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/confirm.html b/templates/confirm.html index 9e842c3..55288e3 100644 --- a/templates/confirm.html +++ b/templates/confirm.html @@ -75,7 +75,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/edit.html b/templates/edit.html index 3d4a511..8dc1bc4 100644 --- a/templates/edit.html +++ b/templates/edit.html @@ -123,7 +123,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2023</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/index.html b/templates/index.html index 46ba406..2fae264 100644 --- a/templates/index.html +++ b/templates/index.html @@ -180,7 +180,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/manage.html b/templates/manage.html index c9d2808..b60761c 100644 --- a/templates/manage.html +++ b/templates/manage.html @@ -151,7 +151,7 @@ function checkAddress(inputValue) { </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/message.html b/templates/message.html index 84d2779..016a657 100644 --- a/templates/message.html +++ b/templates/message.html @@ -69,7 +69,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/plugin-output.html b/templates/plugin-output.html index 723cdd6..82be905 100644 --- a/templates/plugin-output.html +++ b/templates/plugin-output.html @@ -69,7 +69,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/plugin.html b/templates/plugin.html index ac08512..2209aaa 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -71,7 +71,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/plugins.html b/templates/plugins.html index d3cec6f..98b6a19 100644 --- a/templates/plugins.html +++ b/templates/plugins.html @@ -70,7 +70,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/receive.html b/templates/receive.html index cf91ba0..7780d7c 100644 --- a/templates/receive.html +++ b/templates/receive.html @@ -74,7 +74,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/search.html b/templates/search.html index 68dde5f..f08627a 100644 --- a/templates/search.html +++ b/templates/search.html @@ -115,7 +115,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/send.html b/templates/send.html index f72648b..7eee37c 100644 --- a/templates/send.html +++ b/templates/send.html @@ -118,7 +118,7 @@ function checkAddress(inputValue) { </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/settings.html b/templates/settings.html index 2da6b9b..78974e4 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -68,7 +68,7 @@ <h3 class="mb-1" style="text-align: center;color: rgb(0,255,0);">{{success}}</h3> <div class="card"> <div class="card-body"> - <h4 class="card-title">Node Settings</h4> + <h4 class="card-title">Node Settings</h4><small>HSD Version: v{{hsd_version}}</small> <h6 class="text-muted card-subtitle mb-2">Settings that affect all wallets</h6> <ul class="list-group"> <li class="list-group-item"> @@ -105,7 +105,7 @@ </div> </div> </div> - <div class="container-fluid" style="margin-top: 50px;"> + <div class="container-fluid" style="margin-top: 50px;margin-bottom: 50px;"> <div class="card"> <div class="card-body"> <h4 class="card-title">About</h4> @@ -117,7 +117,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/success.html b/templates/success.html index 7b654b2..13d58b5 100644 --- a/templates/success.html +++ b/templates/success.html @@ -73,7 +73,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a> diff --git a/templates/tx.html b/templates/tx.html index 4466fb4..06a7a0e 100644 --- a/templates/tx.html +++ b/templates/tx.html @@ -107,7 +107,7 @@ </div> <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);"> <div class="container my-auto"> - <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2024</span></div> + <div class="text-center my-auto copyright"><span>Copyright © FireWallet 2025</span></div> </div> </footer> </div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a>