fixes

Author: abenso

app/ui/view_nbgl.c

@@ -512,7 +512,7 @@ static void config_useCaseMessageReview() {
     } else {
         nbgl_useCaseReview(TYPE_MESSAGE, &pairList, &C_REVIEW_ICON,
                            (intro_message == NULL ? "Review Message" : intro_message), intro_submessage,
-                           (approval_label_buf[0] != '\0' ? approval_label_buf : APPROVE_LABEL_NBGL),
+                           (approval_label_buf[0] != '\0' ? approval_label_buf : APPROVE_LABEL_NBGL_MSG),
                            reviewMessageChoice);
     }
 }

makefiles/Makefile.devices

@@ -38,11 +38,9 @@ endif
 
 #######################################
 ifeq ($(TARGET_NAME),TARGET_NANOX)
-ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
-else
-HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 endif
 OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_x.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_x.sh
@@ -58,33 +56,27 @@ OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_s2.sh
 endif
 #######################################
 ifeq ($(TARGET_NAME),TARGET_STAX)
-ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
-else
-HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 endif
 OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_stax.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_stax.sh
 endif
 #######################################
 ifeq ($(TARGET_NAME),TARGET_FLEX)
-ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
-else
-HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 endif
 OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_flex.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_flex.sh
 endif
 #######################################
 ifeq ($(TARGET_NAME),TARGET_APEX_P)
-ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
+ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
-else
-HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 endif
 OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_apex_p.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_apex_p.sh