Bugfix: Swan integration tweaks (#1541)

* refresh didn't work, removing * Added a link to the oauth2_start page to be used after flow ends * release-notes
cryptoadvance · Jan 29, 2022 · 51e0f44 · 51e0f44
1 parent ef3483c
commit 51e0f44
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 8 deletions.
diff --git a/docs/development.md b/docs/development.md
@@ -41,7 +41,7 @@
 
 #### Ubuntu/Debian/macOS
 ```
-sudo apt install libusb-1.0-0-dev libudev-dev libffi-dev libssl-dev
+sudo apt install libusb-1.0-0-dev libudev-dev libffi-dev libssl-dev build-essential
 
 # macOS:
 brew install libusb

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,5 +1,37 @@
 [TOC]
 
+## v1.8.0 Januar 29, 2022
+- Feature: Add Jade multisig support #1520 (Stepan Snigirev)
+- Feature: add liquid-testnet support #1527 (Stepan Snigirev)
+- Feature: Allow descriptors with xpubs but without derivations (just wpkh(xpub) ) for wallet imports  #1519 (Stepan Snigirev)
+- Feature: search improvements #1497 (Kim Neunert)
+- Feature: Send dialog refactored and sped up #1454 (Kim Neunert)
+- Feature: Service integration - Swan #1517 (kdmukai)
+- Bugfix: Coin selection - unselection via toggle #1536 (Manolis)
+- Bugfix: deactivate internal Tor for non-AppImages #1499 (Kim Neunert)
+- Bugfix: Edge case for electrum label import #1542 (relativisticelectron)
+- Bugfix/Feature: Restoring send functionalities and better address validation and fee selection #1532 (Manolis)
+- Bugfix: Final Swan service updates #1533 (kdmukai)
+- Bugfix: fix jade signing of unconfidential inputs #1528 (Stepan Snigirev)
+- Bugfix: fix keypoolrefill perfomance and adjusted callback logic #1508 (Kim Neunert)
+- Bugfix: Multiple send bug fixes #1538 (Manolis)
+- Bugfix: prevent using keys twice #1500 (Kim Neunert)
+- Bugfix: Restore ability to import address labels of unlabeled addresses #1511 (relativisticelectron)
+- Bugfix: Revision of test-new-releases.md #1529 (Manolis)
+- Bugfix: Servicediscovery in pyinstaller-packages (specterd) #1531 (Kim Neunert)
+- Bugfix: service icons breaking liquid #1534 (Stepan Snigirev)
+- Bugfix: Very last fixes for Service swan #1537 (Kim Neunert)
+- Documentation: message signature #1310 (Kim Neunert)
+- Documentation: added endless pacman troubleshooting Guide #1498 (Kim Neunert)
+- Documentation: Create document for testing-setups and cleaning up swan #1526 (Kim Neunert)
+- Documentation: Update Donation Link #1514 (Moritz)
+- I18N: Fixed the translation error. #1507 (2a3dex)
+- UIUX: Added suggestion to quit other wallet software when connecting HWI over USB #1535 (Lobbelt)
+- UIUX: Improve behaviour for apps #1540 (Kim Neunert)
+- UIUX: Fixed help text #1510 (relativisticelectron)
+- Chore: Bump HWI to 2.0.2 #1522 (Michael Henke)
+- Chore: Fix running bitcoind with docker #1523 (Kim Neunert)
+
 ## v1.7.2 November 30, 2021
 - Feature: Default blockchain rescan to first Taproot block for Taproot wallets #1479 (kdmukai)
 - Feature: Encrypted user data storage #1453 (kdmukai)

diff --git a/src/cryptoadvance/specter/server_endpoints/wallets_api.py b/src/cryptoadvance/specter/server_endpoints/wallets_api.py
@@ -357,7 +357,7 @@ def wallets_overview_txlist():
     txlist = app.specter.wallet_manager.full_txlist(
         fetch_transactions=fetch_transactions,
         validate_merkle_proofs=app.specter.config.get("validate_merkle_proofs", False),
-        current_blockheight=app.specter.info["blocks"],
+        current_blockheight=app.specter.info.get("blocks"),
         service_id=service_id,
     )
 

diff --git a/src/cryptoadvance/specter/services/swan/templates/swan/oauth2_start.jinja b/src/cryptoadvance/specter/services/swan/templates/swan/oauth2_start.jinja
@@ -1,7 +1,4 @@
 {% extends "base.jinja" %}
-{% block head %}
-<meta http-equiv="refresh" content="30">
-{% endblock %}
 {% block main %}
     <style>
         .big_option {
@@ -36,6 +33,16 @@
             color: #999;
             font-style: italic;
         }
+        /* ToDo: Refactor to style.css */
+        a {
+            /* Copied from .note */
+            font-size: 0.9em;
+            text-decoration: underline;
+            color: inherit;
+        }
+        a:hover {
+            color: #fff ; 
+        }
     </style>
 
     <img src="{{ url_for(service.id +'_endpoint' + '.static', filename=service.logo) }}" width="300"/>
@@ -52,9 +59,13 @@
         </div>
 
         <div class="instructions">
-            {{ _("(will open in a new browser tab)") }}
+
             <br>
             {{ _("Click to sign into your Swan account and authorize Specter integration.") }}
+            {{ _("(will open in a new browser tab)") }} <br>
+            <!-- Empty href will result in keeping on that page if the auth flow didn't succeeded yet -->
+            <!-- If suceeded, the controller will automaticall redirect to settings-page -->
+            After you've succeeded, you can click <a href="">here</a> to configure swan.<br>
         </div>
         <br/>
     </div>

diff --git a/src/cryptoadvance/specter/services/swan/templates/swan/oauth2_success.jinja b/src/cryptoadvance/specter/services/swan/templates/swan/oauth2_success.jinja
@@ -41,9 +41,9 @@
     </style>
     <img src="{{ url_for(service.id +'_endpoint' + '.static', filename=service.logo) }}" width="300"/>
     <div class="card center" style="width: auto; min-width: 90%; margin: 40px;">
-        <h1>Swan Integration Success!</h1>
+        <h1>{{ _("Swan Integration Success!") }}</h1>
         <br/>
-        <h2>You can close this browser tab now and login again.</h2>
+        <h2>{{ _("You can close this browser tab now.") }}</h2>
     </div>
 {% endblock %}