Merge branch 'master' of github.com:Coldcard/firmware

releases/Next-ChangeLog.md

@@ -14,6 +14,7 @@ This lists the new changes that have not yet been published in a normal release.
 - Enhancement: Add `Sign PSBT` shortcut to `NFC Tools` menu
 - Enhancement: Stricter p2sh-p2wpkh validation checks.
 - Enhancement: Mention the need to remove old duress wallets before locking down temporary seed.
+- Enhancement: Add `Theya` option to `Export Wallet`
 - Bugfix: Fix PSBTv2 `PSBT_GLOBAL_TX_MODIFIABLE` parsing.
 - Bugfix: Decrypting Tapsigner backup failed even for correct key.
 - Bugfix: Clear any pending keystrokes before PSBT approval screen.

shared/flow.py

@@ -178,6 +178,7 @@ WalletExportMenu = [
     MenuItem("Zeus", f=ss_descriptor_skeleton,
              arg=(True, [AF_P2WPKH, AF_P2WPKH_P2SH], "Zeus Wallet", "zeus-export.txt")),
     MenuItem("Electrum Wallet", f=electrum_skeleton),
+    MenuItem("Theya", f=named_generic_skeleton, arg="Theya"),
     MenuItem("Wasabi Wallet", f=wasabi_skeleton),
     MenuItem("Unchained", f=unchained_capital_export),
     MenuItem("Lily Wallet", f=named_generic_skeleton, arg="Lily"),

testing/test_export.py

@@ -279,10 +279,12 @@ def test_export_electrum(way, dev, mode, acct_num, pick_menu_item, goto_home, ca
 @pytest.mark.parametrize('way', ["sd", "vdisk", "nfc", "qr"])
 @pytest.mark.parametrize('testnet', [True, False])
 @pytest.mark.parametrize('app', [
+    # no need to run them all - just name check differs
     ("Generic JSON", "Generic Export"),
-    ("Lily Wallet", "Lily Wallet"),
-    ("Sparrow Wallet", "Sparrow Wallet"),
+    # ("Lily Wallet", "Lily Wallet"),
+    # ("Sparrow Wallet", "Sparrow Wallet"),
     ("Nunchuk", "Nunchuk Wallet"),
+    # ("Theya", "Theya Wallet"),
 ])
 def test_export_coldcard(way, dev, acct_num, app, pick_menu_item, goto_home, cap_story, need_keypress,
                          microsd_path, nfc_read_json, virtdisk_path, addr_vs_path, enter_number,