From 00a56eaa8a108e27921849567e04d67ab8146455 Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Thu, 7 Dec 2023 12:52:49 +0100 Subject: [PATCH] bugfix: add missing ftux for extended key import (as master) (cherry picked from commit 285c90999eb37354ebac4fff4f6fba6706a2f762) --- releases/ChangeLog.md | 1 + testing/test_ux.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/releases/ChangeLog.md b/releases/ChangeLog.md index a3a16785..13e1a98f 100644 --- a/releases/ChangeLog.md +++ b/releases/ChangeLog.md @@ -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 diff --git a/testing/test_ux.py b/testing/test_ux.py index 10d32036..89bc2177 100644 --- a/testing/test_ux.py +++ b/testing/test_ux.py @@ -277,7 +277,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') @@ -313,7 +315,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') @@ -370,7 +372,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()