Merge pull request #6 from sandman21vs/close-wallet-label

Call the way out of the wallet what it does

Author: oroderico

README.md

@@ -302,7 +302,7 @@ never padded with blank rows. Only labels are listed. Values meant to be transcr
 instead, split by what fits the display.
 
 The last row of every list with somewhere to return to is the way out of it —
-`Back`, `Done / erase`, `[delete]` — and a rule is drawn above it so it is not
+`Back`, `Erase and exit`, `[delete]` — and a rule is drawn above it so it is not
 read as one more choice. That row is always last, in every such list, so
 leaving a screen is always in the same place. The one list with nowhere to
 return to is the main menu itself: there is no `Back` row there, and the

host/origo_simulator.c

@@ -431,7 +431,7 @@ static bool word_numbers_round_trip_is_sound(void)
  * last glyph that fits; nothing here is transcribed, but a silently shortened
  * label still misnames what the buttons are about to do. */
 static const char* const menu_labels[] = { "Master fingerprint", "Native SegWit (BIP84)", "Taproot (BIP86)",
-    "Account key", "Addresses", "Account key format", "xpub", "zpub", "Done / erase", "New Seed", "From entropy",
+    "Account key", "Addresses", "Account key format", "xpub", "zpub", "Erase and exit", "New Seed", "From entropy",
     "Restore Seed", "Complete checksum", "About", "Settings", "11 words + 7 coins", "23 words + 3 coins",
     "No passphrase", "Enter passphrase", "D6 dice", "D20 dice", "Coin flips", "Cards", "Back", "12 words",
     "24 words", "[delete]", "[back]", "Type the letters", "Enter word numbers", "Plain text", "Backup",

main/seedtool_app.c

@@ -1266,7 +1266,7 @@ static int review_and_confirm(char words[][SEEDTOOL_MAX_WORD_LEN + 1], const siz
      * address_labels: these rows are the mnemonic in plain text, one word
      * each, and they live in .bss rather than on a stack frame that the next
      * screen would overwrite anyway. Leaving them behind kept a restored seed
-     * readable in RAM for the rest of the session - past "Done / erase" and
+     * readable in RAM for the rest of the session - past "Erase and exit" and
      * past the session-timeout screen, which erases nothing here. Clearing on
      * entry as well as exit keeps a 12-word restore from leaving rows 12..23
      * of a previous 24-word one on show. */
@@ -2149,7 +2149,7 @@ static void show_wallet_data(const char* mnemonic)
     (void)snprintf(wallet_title, sizeof(wallet_title), "Wallet @%s", fphex);
     size_t cursor = 0;
     for (;;) {
-        const char* menu[] = { "Backup", "Extended public key", "Derivation", "Addresses", "Done / erase" };
+        const char* menu[] = { "Backup", "Extended public key", "Derivation", "Addresses", "Erase and exit" };
         const int selected = choose_kept(wallet_title, menu, sizeof(menu) / sizeof(menu[0]), true, &cursor);
         if (selected < 0 || selected == 4) {
             break;
@@ -2539,7 +2539,7 @@ static int collect_entropy(const int source, const size_t words)
 }
 
 /* Returns whether a seed was actually generated and carried all the way
- * through the wallet viewer to Done/erase (or a timeout) - as opposed to the
+ * through the wallet viewer to Erase and exit (or a timeout) - as opposed to the
  * reader backing out of the source or length picker before ever starting.
  * show_new_seed_menu uses this to tell "done, go all the way home" apart from
  * plain "back one level". */
@@ -2643,10 +2643,10 @@ static void show_new_seed_menu(void)
         if (selected < 0 || selected == 2) {
             return;
         }
-        /* A seed that made it all the way to Done/erase (or a timeout) closes
+        /* A seed that made it all the way to Erase and exit (or a timeout) closes
          * this menu too, straight back to the Origo/Home menu, rather than
          * reopening "New Seed" - that reopening was the actual bug: pressing
-         * Done/erase landed back inside New Seed instead of at Home. Backing
+         * Erase and exit landed back inside New Seed instead of at Home. Backing
          * out of the source/length picker before anything was generated
          * keeps the old "one level up" behaviour. */
         if (selected == 0 ? create_seed() : complete_checksum()) {

main/seedtool_render.c

@@ -485,8 +485,8 @@ void seedtool_render_list(const char* title, const char* const* items, const siz
         const char* const item = items[top + row];
         const bool highlighted = top + row == selected;
         const int y = LIST_TOP + (int)row * LIST_ROW_HEIGHT;
-        /* The last row of every list is the way out of it — Back, Reboot,
-         * Done / erase, [delete]. A rule above it lifts it out of the choices,
+        /* The last row of every list is the way out of it — Back, Erase and
+         * exit, [delete]. A rule above it lifts it out of the choices,
          * which is what it is not. It goes in the gap between cells so the
          * selection bar never paints over it. */
         if (top + row == count - 1 && count > 1) {