From 13a8e163714a140bb0d328b06519eefceeb1e2bc Mon Sep 17 00:00:00 2001 From: "Peter D. Gray" Date: Mon, 24 Jun 2024 08:46:37 -0400 Subject: [PATCH] microcopy changes --- releases/Next-ChangeLog.md | 2 +- shared/flow.py | 11 +++++------ shared/nvstore.py | 2 +- testing/test_ephemeral.py | 8 ++++---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md index 292d5140..a419cd67 100644 --- a/releases/Next-ChangeLog.md +++ b/releases/Next-ChangeLog.md @@ -11,7 +11,7 @@ This lists the new changes that have not yet been published in a normal release. transaction on the MicroSD card (See `Tools > NFC Tools > Push Transaction`) - New Feature: Transaction output explorer: allows view output details of larger (10+ output) transactions before signing. -- New Feature: New setting to always show XFP as first item in home menu +- New Feature: New setting to enable always showing XFP as first item in home menu. - 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. diff --git a/shared/flow.py b/shared/flow.py index 7566c9a8..4161c585 100644 --- a/shared/flow.py +++ b/shared/flow.py @@ -156,12 +156,11 @@ data or filenames.'''), ToggleMenuItem('Menu Wrapping', 'wa', ['Default Off', 'Enable'], story='''When enabled, allows scrolling past menu top/bottom \ (wrap around). By default, this is only happens in very large menus.'''), - ToggleMenuItem('Home Menu XFP', 'hmx', ['Only tmp', 'Always'], - story=('By default, only XFP of current loaded temporary seed ' - 'is shown as first menu item in home menu. ' - 'By setting this to "Always", ' - 'XFP will be shown for master seed too. ' - 'Master seed is displayed with < >, temporary seeds with [ ].'), + ToggleMenuItem('Home Menu XFP', 'hmx', ['Only Tmp', 'Always Show'], + story=('Forces display of XFP (seed fingerprint) ' + 'at top of main menu. Normally, XFP is shown only when ' + 'temporary seed is active.\n\n' + 'Master seed is displayed as , temporary seeds as [XFP].'), predicate=has_secrets, on_change=goto_home), ToggleMenuItem('Keyboard EMU', 'emu', ['Default Off', 'Enable'], diff --git a/shared/nvstore.py b/shared/nvstore.py index 5b6e51a1..449e469b 100644 --- a/shared/nvstore.py +++ b/shared/nvstore.py @@ -61,7 +61,7 @@ from utils import call_later_ms # aei = (bool) allow changing start index in Address Explorer # b85max = (bool) allow max BIP-32 int value in BIP-85 derivations # ptxurl = (str) URL for PushTx feature, clear to disable feature -# hmx = (bool) Home Menu Xfp settings +# hmx = (bool) Force display of current XFP in home menu, even w/o tmp seed active # Stored w/ key=00 for access before login # _skip_pin = hard code a PIN value (dangerous, only for debug) diff --git a/testing/test_ephemeral.py b/testing/test_ephemeral.py index 808e7875..a399574e 100644 --- a/testing/test_ephemeral.py +++ b/testing/test_ephemeral.py @@ -1437,9 +1437,9 @@ def test_home_menu_xfp(goto_home, pick_menu_item, press_select, cap_story, cap_m pick_menu_item("Home Menu XFP") time.sleep(.1) _, story = cap_story() - if "XFP will be shown for master seed too" in story: + if "Forces display of XFP" in story: press_select() - pick_menu_item("Always") + pick_menu_item("Always Show") time.sleep(.1) m = cap_menu() assert m[1] == "Ready To Sign" @@ -1466,9 +1466,9 @@ def test_home_menu_xfp(goto_home, pick_menu_item, press_select, cap_story, cap_m pick_menu_item("Home Menu XFP") time.sleep(.1) _, story = cap_story() - if "XFP will be shown for master seed too" in story: + if "Forces display of XFP" in story: press_select() - pick_menu_item("Only tmp") + pick_menu_item("Only Tmp") time.sleep(.1) m = cap_menu() assert m[0] == "Ready To Sign"