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

move 12 Words mnemonic options at the top of the menus

Browse Source 
(cherry picked from commit e3014390c4)
This commit is contained in:
scgbckbone 2023-10-21 21:45:15 +02:00 committed by doc-hex
parent 6a53f3524e
commit 0dda18b04c
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
docs/menu-tree.txt
View File

@ -4,14 +4,14 @@
View Identity
Temporary Seed
Generate Words
24 Words
12 Words
24 Word Dice Roll
24 Words
12 Word Dice Roll
24 Word Dice Roll
Import Words
24 Words
18 Words
12 Words
18 Words
24 Words
Import via NFC
Import XPRV
Tapsigner Backup
@ -29,16 +29,16 @@
[IF BLANK WALLET]
New Seed Words
24 Word (default)
12 Word
24 Word Dice Roll
12 Word Dice Roll
Import Existing
12 Words
24 Words
12 Word Dice Roll
24 Word Dice Roll
Import Existing
12 Words
[SEED WORD MENUS]
18 Words
[SEED WORD MENUS]
12 Words
24 Words
[SEED WORD MENUS]
Restore Backup
Clone Coldcard
@ -50,14 +50,14 @@
View Identity
Temporary Seed
Generate Words
24 Words
12 Words
24 Word Dice Roll
24 Words
12 Word Dice Roll
24 Word Dice Roll
Import Words
24 Words
18 Words
12 Words
18 Words
24 Words
Import via NFC
Import XPRV
Tapsigner Backup
@ -175,14 +175,14 @@
(none saved yet)
Temporary Seed
Generate Words
24 Words
12 Words
24 Word Dice Roll
24 Words
12 Word Dice Roll
24 Word Dice Roll
Import Words
24 Words
18 Words
12 Words
18 Words
24 Words
Import via NFC
Import XPRV
Tapsigner Backup
@ -249,14 +249,14 @@
View Identity
Temporary Seed
Generate Words
24 Words
12 Words
24 Word Dice Roll
24 Words
12 Word Dice Roll
24 Word Dice Roll
Import Words
24 Words
18 Words
12 Words
18 Words
24 Words
Import via NFC
Import XPRV
Tapsigner Backup

1
releases/ChangeLog.md
View File

@ -3,6 +3,7 @@
- Enhancement: Add current temporary seed to Seed Vault from within Seed Vault menu.
If current active temporary seed is not saved yet, `Add current tmp` menu item is
present in Seed Vault menu.
- Reorg: `12 Words` menu option preferred on the top of the menu in all the seed menus
## 5.2.0 - 2023-10-10

12
shared/flow.py
View File

@ -290,10 +290,9 @@ VirginSystem = [
]
ImportWallet = [
# xxxxxxxxxxxxxxxx
MenuItem("24 Words", menu=start_seed_import, arg=24),
MenuItem("18 Words", menu=start_seed_import, arg=18),
MenuItem("12 Words", menu=start_seed_import, arg=12),
MenuItem("18 Words", menu=start_seed_import, arg=18),
MenuItem("24 Words", menu=start_seed_import, arg=24),
MenuItem("Restore Backup", f=restore_everything),
MenuItem("Clone Coldcard", menu=clone_start),
MenuItem("Import XPRV", f=import_xprv, arg=False), # ephemeral=False
@ -302,11 +301,10 @@ ImportWallet = [
]
NewSeedMenu = [
# xxxxxxxxxxxxxxxx
MenuItem("24 Word (default)", f=pick_new_seed, arg=24),
MenuItem("12 Word", f=pick_new_seed, arg=12),
MenuItem("24 Word Dice Roll", f=new_from_dice, arg=24),
MenuItem("12 Words", f=pick_new_seed, arg=12),
MenuItem("24 Words", f=pick_new_seed, arg=24),
MenuItem("12 Word Dice Roll", f=new_from_dice, arg=12),
MenuItem("24 Word Dice Roll", f=new_from_dice, arg=24),
]
# has PIN, but no secret seed yet

8
shared/seed.py
View File

@ -1018,16 +1018,16 @@ class EphemeralSeedMenu(MenuSystem):
from actions import nfc_recv_ephemeral, import_tapsigner_backup_file, import_xprv
import_ephemeral_menu = [
MenuItem("24 Words", f=cls.ephemeral_seed_import, arg=24),
MenuItem("18 Words", f=cls.ephemeral_seed_import, arg=18),
MenuItem("12 Words", f=cls.ephemeral_seed_import, arg=12),
MenuItem("18 Words", f=cls.ephemeral_seed_import, arg=18),
MenuItem("24 Words", f=cls.ephemeral_seed_import, arg=24),
MenuItem("Import via NFC", f=nfc_recv_ephemeral, predicate=lambda: NFC is not None),
]
gen_ephemeral_menu = [
MenuItem("24 Words", f=cls.ephemeral_seed_generate, arg=24),
MenuItem("12 Words", f=cls.ephemeral_seed_generate, arg=12),
MenuItem("24 Word Dice Roll", f=cls.ephemeral_seed_generate_from_dice, arg=24),
MenuItem("24 Words", f=cls.ephemeral_seed_generate, arg=24),
MenuItem("12 Word Dice Roll", f=cls.ephemeral_seed_generate_from_dice, arg=12),
MenuItem("24 Word Dice Roll", f=cls.ephemeral_seed_generate_from_dice, arg=24),
]
rv = [

2
testing/test_ux.py
View File

@ -293,7 +293,7 @@ def test_new_wallet(nwords, goto_home, pick_menu_item, cap_story, need_keypress,
unit_test('devtest/clear_seed.py')
m = cap_menu()
pick_menu_item('New Seed Words')
pick_menu_item('24 Word (default)' if nwords == 24 else f'{nwords} Word')
pick_menu_item(f'{nwords} Word')
title, body = cap_story()
assert title == 'NO-TITLE'