Merge branch 'master' into mm/jade-export-wallet-via-qr

pyinstaller/electron/yarn.lock

@@ -704,9 +704,9 @@ [email protected]:
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
-electron@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.npmjs.org/electron/-/electron-22.1.0.tgz"
+electron@^22.3.21:
+  version "22.3.21"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-22.3.21.tgz#a817446cc1e62e9650522fa7eae389f9fc5b5e19"
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^16.11.26"

src/cryptoadvance/specter/devices/hwi/jade.py

@@ -556,10 +556,11 @@ def display_multisig_address(
             paths.append(parse_path(path))
 
         # sort origins, signers and paths according to origins (like in _get_multisig_name)
-        signer_origins, signers, paths = [
-            list(a) for a in zip(*sorted(zip(signer_origins, signers, paths)))
-        ]
-
+        # But, only sort if sorted_multi is used (and thus the order of xpubs is not relevant)
+        if multisig.is_sorted:
+            signer_origins, signers, paths = [
+                list(a) for a in zip(*sorted(zip(signer_origins, signers, paths)))
+            ]
         # Get a deterministic name for this multisig wallet
         script_variant = self._convertAddrType(addr_type, multisig=True)
         multisig_name = self._get_multisig_name(
@@ -572,7 +573,7 @@ def display_multisig_address(
             self._network(),
             multisig_name,
             script_variant,
-            True,  # always use sorted
+            multisig.is_sorted,
             multisig.thresh,
             signers,
         )

src/cryptoadvance/specter/templates/includes/hwi/components/wallet.jinja

@@ -1,13 +1,13 @@
 {% if wallet is defined %}
 
-<div id="hwi_display_address" class="flex-center flex-column hidden" data-style="overflow-wrap: break-word;">
+<div id="hwi_display_address" class="flex-center flex-column hidden p-4 bg-dark-800" data-style="overflow-wrap: break-word;">
     <h2>{{ _("Confirm Address") }}</h2><br>
     <div>
         {{ _("Please confirm address matches on your ")}}<span id="hwi_device_name">{{ _('device')}}</span><br><br>
         {{ _("Expected address") }}:<br><span id="expected_address"></span>
     </div>
-    <div class="flex-center">
-        <img src="{{ url_for('static', filename='img/loader_boxes.svg') }}"/>
+    <div class="flex justify-center mt-4 ">
+        <img src="{{ url_for('static', filename='img/loader_boxes.svg') }}" class="w-16 h-16"/>
     </div>
 </div>