Skip to content

Commit 1242d67

Browse files
committed
Call the way out of the wallet what it does
"Done / erase" named two things, and neither was the one the reader wants. "Done" is a state, not an action - done with what? - and "erase" reads like it destroys something the reader owns, which is exactly the wrong impression to give on the row that ends a session with a live seed on screen. Nothing on the device is erased: there is nothing persistent to erase. "Shutdown" also puts the row in the same voice as the others it sits with - "New Seed", "Restore Seed", "Backup" - rather than being the one label written as a status. Renamed everywhere it is described as well as where it is shown: the comments that track how a seed reaches the end of a session, the render note about the last row of a list, the README's list of the ways out, and the self-test's label-fits-a-row set.
1 parent e947f4e commit 1242d67

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ never padded with blank rows. Only labels are listed. Values meant to be transcr
302302
instead, split by what fits the display.
303303

304304
The last row of every list with somewhere to return to is the way out of it —
305-
`Back`, `Done / erase`, `[delete]` — and a rule is drawn above it so it is not
305+
`Back`, `Shutdown`, `[delete]` — and a rule is drawn above it so it is not
306306
read as one more choice. That row is always last, in every such list, so
307307
leaving a screen is always in the same place. The one list with nowhere to
308308
return to is the main menu itself: there is no `Back` row there, and the

‎host/origo_simulator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static bool word_numbers_round_trip_is_sound(void)
275275
* last glyph that fits; nothing here is transcribed, but a silently shortened
276276
* label still misnames what the buttons are about to do. */
277277
static const char* const menu_labels[] = { "Master fingerprint", "Native SegWit (BIP84)", "Taproot (BIP86)",
278-
"Account key", "Addresses", "Account key format", "xpub", "zpub", "Done / erase", "New Seed", "From entropy",
278+
"Account key", "Addresses", "Account key format", "xpub", "zpub", "Shutdown", "New Seed", "From entropy",
279279
"Restore Seed", "Complete checksum", "About", "Settings", "11 words + 7 coins", "23 words + 3 coins",
280280
"No passphrase", "Enter passphrase", "D6 dice", "D20 dice", "Coin flips", "Cards", "Back", "12 words",
281281
"24 words", "[delete]", "[back]", "Type the letters", "Enter word numbers", "Plain text", "Backup",

‎main/seedtool_app.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ static int review_and_confirm(char words[][SEEDTOOL_MAX_WORD_LEN + 1], const siz
12061206
* address_labels: these rows are the mnemonic in plain text, one word
12071207
* each, and they live in .bss rather than on a stack frame that the next
12081208
* screen would overwrite anyway. Leaving them behind kept a restored seed
1209-
* readable in RAM for the rest of the session - past "Done / erase" and
1209+
* readable in RAM for the rest of the session - past "Shutdown" and
12101210
* past the session-timeout screen, which erases nothing here. Clearing on
12111211
* entry as well as exit keeps a 12-word restore from leaving rows 12..23
12121212
* of a previous 24-word one on show. */
@@ -1873,7 +1873,7 @@ static void show_wallet_data(const char* mnemonic)
18731873
char account_item[16];
18741874
(void)snprintf(account_item, sizeof(account_item), "Account: %u", (unsigned)account);
18751875
const char* menu[] = { "Master fingerprint", account_item, "Native SegWit (BIP84)", "Taproot (BIP86)",
1876-
"Backup", "Done / erase" };
1876+
"Backup", "Shutdown" };
18771877
const int selected = choose("Wallet", menu, sizeof(menu) / sizeof(menu[0]), true);
18781878
if (selected < 0 || selected == 5) {
18791879
break;
@@ -2257,7 +2257,7 @@ static int collect_entropy(const int source, const size_t words)
22572257
}
22582258

22592259
/* Returns whether a seed was actually generated and carried all the way
2260-
* through the wallet viewer to Done/erase (or a timeout) - as opposed to the
2260+
* through the wallet viewer to Shutdown (or a timeout) - as opposed to the
22612261
* reader backing out of the source or length picker before ever starting.
22622262
* show_new_seed_menu uses this to tell "done, go all the way home" apart from
22632263
* plain "back one level". */
@@ -2358,10 +2358,10 @@ static void show_new_seed_menu(void)
23582358
if (selected < 0 || selected == 2) {
23592359
return;
23602360
}
2361-
/* A seed that made it all the way to Done/erase (or a timeout) closes
2361+
/* A seed that made it all the way to Shutdown (or a timeout) closes
23622362
* this menu too, straight back to the Origo/Home menu, rather than
23632363
* reopening "New Seed" - that reopening was the actual bug: pressing
2364-
* Done/erase landed back inside New Seed instead of at Home. Backing
2364+
* Shutdown landed back inside New Seed instead of at Home. Backing
23652365
* out of the source/length picker before anything was generated
23662366
* keeps the old "one level up" behaviour. */
23672367
if (selected == 0 ? create_seed() : complete_checksum()) {

‎main/seedtool_render.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ void seedtool_render_list(const char* title, const char* const* items, const siz
486486
const bool highlighted = top + row == selected;
487487
const int y = LIST_TOP + (int)row * LIST_ROW_HEIGHT;
488488
/* The last row of every list is the way out of it — Back, Reboot,
489-
* Done / erase, [delete]. A rule above it lifts it out of the choices,
489+
* Shutdown, [delete]. A rule above it lifts it out of the choices,
490490
* which is what it is not. It goes in the gap between cells so the
491491
* selection bar never paints over it. */
492492
if (top + row == count - 1 && count > 1) {

0 commit comments

Comments
 (0)