src/tests: Use NBGL for all Nano devices

Makefile

@@ -15,12 +15,6 @@
 #   limitations under the License.
 # ****************************************************************************
 
-ifeq ($(BOLOS_SDK),)
-$(error Environment variable BOLOS_SDK is not set)
-endif
-
-include $(BOLOS_SDK)/Makefile.defines
-
 ########################################
 #        Mandatory configuration       #
 ########################################
@@ -85,6 +79,7 @@ VARIANT_VALUES = BOL
 ########################################
 ENABLE_BLUETOOTH = 1
 #ENABLE_NFC = 1
+ENABLE_NBGL_FOR_NANOS = 1
 
 ########################################
 #         NBGL custom features         #
@@ -108,4 +103,8 @@ ENABLE_NBGL_QRCODE = 1
 #DISABLE_DEBUG_LEDGER_ASSERT = 1
 #DISABLE_DEBUG_THROW = 1
 
+ifeq ($(BOLOS_SDK),)
+$(error Environment variable BOLOS_SDK is not set)
+endif
+
 include $(BOLOS_SDK)/Makefile.standard_app

src/ui/display.h

@@ -2,6 +2,14 @@
 
 #include <stdbool.h>  // bool
 
+#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2)
+#define ICON_APP_BOILERPLATE C_app_boilerplate_16px
+#define ICON_APP_WARNING     C_icon_warning
+#elif defined(TARGET_STAX) || defined(TARGET_FLEX)
+#define ICON_APP_BOILERPLATE C_app_boilerplate_64px
+#define ICON_APP_WARNING     C_Warning_64px
+#endif
+
 /**
  * Callback to reuse action with approve/reject in step FLOW.
  */

src/ui/menu_nbgl.c

@@ -24,6 +24,7 @@
 
 #include "../globals.h"
 #include "menu.h"
+#include "display.h"
 
 //  -----------------------------------------------------------
 //  ----------------------- HOME PAGE -------------------------
@@ -82,7 +83,7 @@ static void review_warning_choice(bool confirm) {
 
     // Reset setting menu to the right page
     nbgl_useCaseHomeAndSettings(APPNAME,
-                                &C_app_boilerplate_64px,
+                                &ICON_APP_BOILERPLATE,
                                 NULL,
                                 initSettingPage,
                                 &settingContents,
@@ -111,10 +112,15 @@ static void controls_callback(int token, uint8_t index, int page) {
         // to activate the dummy 2 setting
         if (!N_storage.dummy2_allowed) {
             // Display the warning message and ask the user to confirm
-            nbgl_useCaseChoice(&C_Warning_64px,
+            nbgl_useCaseChoice(&ICON_APP_WARNING,
                                "Dummy 2",
+#ifndef TARGET_NANOS
                                "Are you sure to\nallow dummy 2\nin transactions?",
                                "I understand, confirm",
+#else
+                               "Are you sure to allow dummy 2 in transactions?",
+                               "Confirm",
+#endif
                                "Cancel",
                                review_warning_choice);
         } else {
@@ -134,16 +140,20 @@ void ui_menu_main(void) {
     switches[DUMMY_SWITCH_1_ID].text = "Dummy 1";
     switches[DUMMY_SWITCH_1_ID].subText = "Allow dummy 1\nin transactions";
     switches[DUMMY_SWITCH_1_ID].token = DUMMY_SWITCH_1_TOKEN;
+#ifdef HAVE_PIEZO_SOUND
     switches[DUMMY_SWITCH_1_ID].tuneId = TUNE_TAP_CASUAL;
+#endif
 
     switches[DUMMY_SWITCH_2_ID].initState = (nbgl_state_t) N_storage.dummy2_allowed;
     switches[DUMMY_SWITCH_2_ID].text = "Dummy 2";
     switches[DUMMY_SWITCH_2_ID].subText = "Allow dummy 2\nin transactions";
     switches[DUMMY_SWITCH_2_ID].token = DUMMY_SWITCH_2_TOKEN;
+#ifdef HAVE_PIEZO_SOUND
     switches[DUMMY_SWITCH_2_ID].tuneId = TUNE_TAP_CASUAL;
+#endif
 
     nbgl_useCaseHomeAndSettings(APPNAME,
-                                &C_app_boilerplate_64px,
+                                &ICON_APP_BOILERPLATE,
                                 NULL,
                                 INIT_HOME_PAGE,
                                 &settingContents,

src/ui/nbgl_display_address.c

@@ -66,7 +66,7 @@ int ui_display_address() {
 
     nbgl_useCaseAddressReview(g_address,
                               NULL,
-                              &C_app_boilerplate_64px,
+                              &ICON_APP_BOILERPLATE,
                               "Verify BOL address",
                               NULL,
                               review_choice);

src/ui/nbgl_display_transaction.c

@@ -42,8 +42,8 @@ static char g_amount[30];
 // Buffer where the transaction address string is written
 static char g_address[43];
 
-static nbgl_layoutTagValue_t pairs[2];
-static nbgl_layoutTagValueList_t pairList;
+static nbgl_contentTagValue_t pairs[2];
+static nbgl_contentTagValueList_t pairList;
 
 // called when long press button on 3rd page is long-touched or when reject footer is touched
 static void review_choice(bool confirm) {
@@ -97,8 +97,12 @@ int ui_display_transaction() {
     // Start review
     nbgl_useCaseReview(TYPE_TRANSACTION,
                        &pairList,
-                       &C_app_boilerplate_64px,
-                       "Review transaction\nto send BOL",
+                       &ICON_APP_BOILERPLATE,
+                       "Review transaction"
+#ifndef TARGET_NANOS
+                       "\nto send BOL"
+#endif
+                       ,
                        NULL,
                        "Sign transaction\nto send BOL",
                        review_choice);