coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ownership success UX story title compat Mk4/Q

Browse Source 
(cherry picked from commit 5694ada611)
This commit is contained in:
Peter D. Gray 2025-02-13 15:02:04 +01:00 committed by scgbckbone
parent 1f7205186f
commit 2e30c9d576
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared/ownership.py
View File

@ -336,15 +336,17 @@ class OwnershipCache:
esc = "0"
msg += "\n\nPress (0) to sign message with this key."
title = "Verified"
if version.has_qwerty:
esc += KEY_QR
title += " Address"
else:
msg += ' (1) for address QR'
esc += '1'
title += "!"
while 1:
ch = await ux_show_story(msg, title="Verified Address",
escape=esc, hint_icons=KEY_QR)
ch = await ux_show_story(msg, title=title, escape=esc, hint_icons=KEY_QR)
if ch in ("1"+KEY_QR):
await show_qr_code(
addr,

6
testing/test_ownership.py
View File

@ -240,7 +240,7 @@ def test_ux(valid, testnet, method,
if title == 'Unknown Address' and not testnet:
assert 'That address is not valid on Bitcoin Testnet' in story
elif valid:
assert title == 'Verified Address'
assert title == ('Verified Address' if is_q1 else "Verified!")
assert 'Found in wallet' in story
assert 'Derivation path' in story
@ -270,7 +270,7 @@ def test_address_explorer_saver(af, wipe_cache, settings_set, goto_address_explo
pick_menu_item, need_keypress, sim_exec, clear_ms,
import_ms_wallet, press_select, goto_home, nfc_write,
load_shared_mod, load_export_and_verify_signature,
cap_story, load_export, offer_minsc_import):
cap_story, load_export, offer_minsc_import, is_q1):
goto_home()
wipe_cache()
settings_set('accts', [])
@ -330,7 +330,7 @@ def test_address_explorer_saver(af, wipe_cache, settings_set, goto_address_explo
title, story = cap_story()
assert addr == addr_from_display_format(story.split("\n\n")[0])
assert title == 'Verified Address'
assert title == ('Verified Address' if is_q1 else "Verified!")
assert 'Found in wallet' in story
assert 'Derivation path' in story
if af == "P2SH-Segwit":