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

bugfix: add missing ftux for extended key import (as master)

Browse Source 
(cherry picked from commit 285c90999e)
This commit is contained in:
scgbckbone 2023-12-07 12:52:49 +01:00 committed by doc-hex
parent 05bd7ab39c
commit b78b30f0b1
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
releases/ChangeLog.md
View File

@ -10,6 +10,7 @@
- Enhancement: `12 Words` menu option preferred on the top of the menu in all the seed menus
(rather than 24 words).
- Bugfix: Handle any failures in slot reading when loading settings
- Bugfix: Add missing First Time UX for extended key import as master seed
## 5.2.0 - 2023-10-10

2
shared/seed.py
View File

@ -543,7 +543,7 @@ async def ephemeral_seed_generate(nwords):
async def set_seed_extended_key(extended_key):
encoded, chain = xprv_to_encoded_secret(extended_key)
set_seed_value(encoded=encoded, chain=chain)
goto_top_menu()
goto_top_menu(first_time=True)
async def set_ephemeral_seed_extended_key(extended_key, meta=None):
encoded, chain = xprv_to_encoded_secret(extended_key)

8
testing/test_ux.py
View File

@ -287,7 +287,9 @@ def test_import_from_dice(count, nwords, goto_home, pick_menu_item, cap_story, n
@pytest.mark.parametrize('multiple_runs', range(3))
@pytest.mark.parametrize('nwords', [12, 24])
def test_new_wallet(nwords, goto_home, pick_menu_item, cap_story, need_keypress, cap_menu, get_secrets, unit_test, pass_word_quiz, multiple_runs, reset_seed_words, expect_ftux):
def test_new_wallet(nwords, goto_home, pick_menu_item, cap_story, need_keypress,
cap_menu, get_secrets, unit_test, pass_word_quiz, multiple_runs,
reset_seed_words, expect_ftux):
# generate a random wallet, and check seeds are what's shown to user, etc
unit_test('devtest/clear_seed.py')
@ -323,7 +325,7 @@ def test_new_wallet(nwords, goto_home, pick_menu_item, cap_story, need_keypress,
@pytest.mark.parametrize('testnet', [True, False])
def test_import_prv(way, testnet, pick_menu_item, cap_story, need_keypress, unit_test, cap_menu,
word_menu_entry, get_secrets, microsd_path, multiple_runs, reset_seed_words,
nfc_write_text, settings_set, virtdisk_path):
nfc_write_text, settings_set, virtdisk_path, expect_ftux):
if testnet:
netcode = "XTN"
settings_set('chain', 'XTN')
@ -380,7 +382,7 @@ def test_import_prv(way, testnet, pick_menu_item, cap_story, need_keypress, unit
need_keypress("y")
pick_menu_item(fname)
unit_test('devtest/abort_ux.py')
expect_ftux()
v = get_secrets()