Skip to content

Commit 384d956

Browse files
author
Jamie C. Driver
committed
passphrase: update BIP39 Passphrase menu option names
1 parent be62d8e commit 384d956

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

main/process/dashboard.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,9 +1337,11 @@ static void handle_wallet_erase_pin(void)
13371337
}
13381338

13391339
// Handle passphrase preferences
1340-
static inline const char* passphrase_frequency_desc_from_flags(const passphrase_freq_t freq)
1340+
static inline const char* passphrase_frequency_desc_from_flags(const passphrase_freq_t freq, const bool shortname)
13411341
{
1342-
return freq == PASSPHRASE_ALWAYS ? "Always" : freq == PASSPHRASE_ONCE ? "Once" : "Never";
1342+
return freq == PASSPHRASE_ALWAYS ? "Always Ask"
1343+
: freq == PASSPHRASE_ONCE ? (shortname ? "Next Login" : "Next Login Only")
1344+
: "Disabled";
13431345
}
13441346
static inline const char* passphrase_method_desc_from_flags(const passphrase_type_t type)
13451347
{
@@ -1351,16 +1353,20 @@ static void handle_passphrase_prefs()
13511353
passphrase_freq_t freq = keychain_get_passphrase_freq();
13521354
passphrase_type_t type = keychain_get_passphrase_type();
13531355

1356+
// In some cases may need to use shorter names on smaller displays
1357+
const bool menu_freq_shortname = CONFIG_DISPLAY_WIDTH < 320;
1358+
const bool carousel_freq_shortname = false;
1359+
13541360
gui_view_node_t* frequency_item = NULL;
13551361
gui_view_node_t* method_item = NULL;
13561362
gui_activity_t* const act = make_bip39_passphrase_prefs_activity(&frequency_item, &method_item);
1357-
update_menu_item(frequency_item, "Frequency", passphrase_frequency_desc_from_flags(freq));
1363+
update_menu_item(frequency_item, "Frequency", passphrase_frequency_desc_from_flags(freq, menu_freq_shortname));
13581364
update_menu_item(method_item, "Method", passphrase_method_desc_from_flags(type));
13591365
gui_set_current_activity(act);
13601366

13611367
gui_view_node_t* frequency_textbox = NULL;
13621368
gui_activity_t* const act_freq = make_carousel_activity("Frequency", NULL, &frequency_textbox);
1363-
gui_update_text(frequency_textbox, passphrase_frequency_desc_from_flags(freq));
1369+
gui_update_text(frequency_textbox, passphrase_frequency_desc_from_flags(freq, carousel_freq_shortname));
13641370

13651371
gui_view_node_t* method_textbox = NULL;
13661372
gui_activity_t* const act_method = make_carousel_activity("Method", NULL, &method_textbox);
@@ -1384,7 +1390,8 @@ static void handle_passphrase_prefs()
13841390
// Never -> Once -> Always -> Once ...
13851391
gui_set_current_activity(act_freq);
13861392
while (true) {
1387-
gui_update_text(frequency_textbox, passphrase_frequency_desc_from_flags(freq));
1393+
gui_update_text(
1394+
frequency_textbox, passphrase_frequency_desc_from_flags(freq, carousel_freq_shortname));
13881395
if (gui_activity_wait_event(act_freq, GUI_EVENT, ESP_EVENT_ANY_ID, NULL, &ev_id, NULL, 0)) {
13891396
if (ev_id == GUI_WHEEL_LEFT_EVENT) {
13901397
freq = (freq == PASSPHRASE_NEVER ? PASSPHRASE_ALWAYS
@@ -1400,7 +1407,8 @@ static void handle_passphrase_prefs()
14001407
}
14011408
}
14021409
}
1403-
update_menu_item(frequency_item, "Frequency", passphrase_frequency_desc_from_flags(freq));
1410+
update_menu_item(
1411+
frequency_item, "Frequency", passphrase_frequency_desc_from_flags(freq, menu_freq_shortname));
14041412
} else if (ev_id == BTN_PASSPHRASE_METHOD) {
14051413
gui_set_current_activity(act_method);
14061414
while (true) {

0 commit comments

Comments
 (0)