Show address from menu in STAX and FLEX

deps/ledger-zxlib/app/ui/view_nbgl.c

@@ -24,6 +24,7 @@
 #include "nbgl_use_case.h"
 #include "ux.h"
 #include "view_internal.h"
+#include "menu_handler.h"
 
 #ifdef APP_SECRET_MODE_ENABLED
 zxerr_t secret_enabled();
@@ -87,6 +88,8 @@
 
 static void h_approve_internal(void) { h_approve(review_type); }
 
+static void h_view_address(void);
+
 #ifdef TARGET_STAX
 #define MAX_INFO_LIST_ITEM_PER_PAGE 3
 #else  // TARGET_FLEX
@@ -96,8 +99,11 @@
 static const char *const INFO_KEYS_PAGE[] = {"Version", "Developed by", "Website", "License"};
 static const char *const INFO_VALUES_PAGE[] = {APPVERSION, "Zondax AG", "https://zondax.ch", "Apache 2.0"};
 
+static const char SHOW_STORED_PUBKEY_TEXT[] = "Show address";
+
 static nbgl_contentInfoList_t infoList = {0};
 static nbgl_genericContents_t settingContents = {0};
+static nbgl_homeAction_t showStoredPubkey = {};
 static nbgl_contentSwitch_t switches[SETTINGS_SWITCHES_NB_LEN];
 
 static void h_expert_toggle() { app_mode_set_expert(!app_mode_expert()); }
@@ -252,33 +258,33 @@
     UNUSED(index);
     UNUSED(page);
 
     switch (token) {
         case EXPERT_MODE_TOKEN:
             h_expert_toggle();
             break;
 
 #ifdef APP_ACCOUNT_MODE_ENABLED
         case ACCOUNT_MODE_TOKEN:
             account_enabled();
             break;
 #endif
 
 #ifdef APP_SECRET_MODE_ENABLED
         case SECRET_MODE_TOKEN:
             secret_enabled();
             break;
 #endif
 
 #ifdef APP_BLINDSIGN_MODE_ENABLED
         case BLINDSIGN_MODE_TOKEN:
             h_blindsign_toggle();
             break;
 #endif
 
         default:
             ZEMU_LOGF(50, "Toggling setting not found\n")
             break;
     }
 }
 
 static void settings_screen_callback(uint8_t index, nbgl_content_t *content) {
@@ -345,8 +351,13 @@
     infoList.infoContents = INFO_VALUES_PAGE;
     infoList.infoTypes = INFO_KEYS_PAGE;
 
+    showStoredPubkey.text = SHOW_STORED_PUBKEY_TEXT;
+    showStoredPubkey.icon = NULL;
+    showStoredPubkey.callback =  h_view_address;
+    showStoredPubkey.style = SOFT_HOME_ACTION;
+
     nbgl_useCaseHomeAndSettings(MENU_MAIN_APP_LINE1, &C_icon_stax_64, home_text, INIT_HOME_PAGE, &settingContents,
-                                &infoList, NULL, app_quit);
+                                &infoList, &showStoredPubkey, app_quit);
 }
 
 void view_message_impl(const char *title, const char *message) {
@@ -505,4 +516,8 @@
     }
 }
 
+static void h_view_address() {
+    handleMenuShowAddress();
+}
+
 #endif

tests/test_app_mainmenu.py

@@ -10,6 +10,7 @@ def test_app_mainmenu(firmware, backend, navigator, test_name):
     """ Check the behavior of the device main menu """
 
     client = FlowCommandSender(backend)
+    choiceIdShowAdderess = 5 if firmware.device == "stax" else 4;
 
     # Navigate in the main menu, click "View address"
     if firmware.device == "nanos":
@@ -41,10 +42,7 @@ def test_app_mainmenu(firmware, backend, navigator, test_name):
         ]
     else:
         instructions = [
-            NavInsID.USE_CASE_HOME_SETTINGS,
-            NavInsID.USE_CASE_SETTINGS_NEXT,
-            NavInsID.USE_CASE_SETTINGS_NEXT,
-            NavInsID.USE_CASE_CHOICE_CONFIRM,
+            NavIns(NavInsID.CHOICE_CHOOSE, [choiceIdShowAdderess]),
             NavInsID.USE_CASE_REVIEW_TAP,
             NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,
             NavInsID.USE_CASE_SETTINGS_MULTI_PAGE_EXIT
@@ -79,10 +77,7 @@ def test_app_mainmenu(firmware, backend, navigator, test_name):
         ]
     else:
         instructions = [
-            NavInsID.USE_CASE_HOME_SETTINGS,
-            NavInsID.USE_CASE_SETTINGS_NEXT,
-            NavInsID.USE_CASE_SETTINGS_NEXT,
-            NavInsID.USE_CASE_CHOICE_CONFIRM,
+            NavIns(NavInsID.CHOICE_CHOOSE, [choiceIdShowAdderess]),
             NavInsID.USE_CASE_REVIEW_TAP,
             NavInsID.USE_CASE_REVIEW_TAP,
             NavInsID.USE_CASE_ADDRESS_CONFIRMATION_CONFIRM,