[pull] master from broxus:master

Makefile

@@ -36,7 +36,7 @@ APP_LOAD_FLAGS=--appFlags 0x200
 # Application version
 APPVERSION_M = 1
 APPVERSION_N = 1
-APPVERSION_P = 2
+APPVERSION_P = 6
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files
@@ -69,7 +69,7 @@ CURVE_APP_LOAD_PARAMS = ed25519
 # and SLIP-0044 standards.
 # If your app needs it, you can specify multiple path by using:
 # `PATH_APP_LOAD_PARAMS = "44'/1'" "45'/1'"`
-PATH_APP_LOAD_PARAMS = "44'/396'"   # purpose=coin(44) / coin_type=Testnet(1)
+PATH_APP_LOAD_PARAMS = "44'/396'"
 
 # Setting to allow building variant applications
 # - <VARIANT_PARAM> is the name of the parameter which should be set
@@ -79,13 +79,16 @@ PATH_APP_LOAD_PARAMS = "44'/396'"   # purpose=coin(44) / coin_type=Testnet(1)
 #   * Values can be the app ticker or anything else but should be unique.
 VARIANT_PARAM = COIN
 
-
 ifeq ($(COIN),VENOM)
 VARIANT_VALUES = VENOM
+VARIANT_ID = 1
 else
 VARIANT_VALUES = EVER
+VARIANT_ID = 2
 endif
 
+DEFINES += VARIANT_ID=$(VARIANT_ID)
+
 # Enabling DEBUG flag will enable PRINTF and disable optimizations
 DEBUG = 1
 

src/ui/display_bagl.c

@@ -137,7 +137,7 @@ UX_STEP_NOCB(ux_sign_transaction_amount,
 UX_STEP_NOCB(ux_sign_transaction_address,
              bnnn_paging,
              {
-                 .title = "Address",
+                 .title = "To",
                  .text = data_context.sign_tr_context.address_str,
              });
 UX_STEP_NOCB(ux_sign_transaction_transaction_id,

src/ui/display_nbgl.c

@@ -4,6 +4,7 @@
 #include "ui/action/validate.h"
 #include "ui/menu.h"
 #include "nbgl_use_case.h"
+#include "icon_nbgl.h"
 
 static nbgl_contentTagValue_t pairs[10];
 static nbgl_contentTagValueList_t pairList;
@@ -52,7 +53,7 @@ static void review_choice_message(bool choice) {
 void ui_display_address() {
     nbgl_useCaseAddressReview(data_context.addr_context.address_str,
                               NULL,
-                              &C_app_everscale_64px,
+                              &ICON_APP,
                               "Verify Address",
                               NULL,
                               review_choice_address);
@@ -78,18 +79,11 @@ void ui_display_public_key() {
     // Setup the review screen
     nbgl_useCaseReviewLight(TYPE_OPERATION,
                             &content,
-                            &C_app_everscale_64px,
+                            &ICON_APP,
                             "Verify Public Key",
                             NULL,  // No subtitle
                             "Approve",
                             review_choice_pubkey);
-
-    // nbgl_useCaseAddressReview(data_context.pk_context.public_key_str,
-    //                           NULL,
-    //                           &C_app_everscale_40px,
-    //                           "Verify Public Key",
-    //                           NULL,
-    //                           review_choice_pubkey);
 }
 
 void ui_display_sign_transaction(int flow) {
@@ -127,7 +121,7 @@ void ui_display_sign_transaction(int flow) {
 
     // Address line
     if (strcmp(action, "Transfer") == 0 || strcmp(action, "Deploy") == 0) {
-        pairs[pairIndex].item = "Address";
+        pairs[pairIndex].item = "To";
         pairs[pairIndex].value = (char*) data_context.sign_tr_context.address_str;
         pairIndex++;
     }
@@ -148,7 +142,7 @@ void ui_display_sign_transaction(int flow) {
     // Setup the review screen
     nbgl_useCaseReview(TYPE_TRANSACTION,
                        &pairList,
-                       &C_app_everscale_64px,
+                       &ICON_APP,
                        "Review transaction",
                        NULL,  // No subtitle
                        "Review transaction",
@@ -171,7 +165,7 @@ void ui_display_sign() {
     // Setup the review screen
     nbgl_useCaseReview(TYPE_MESSAGE,
                        &pairList,
-                       &C_app_everscale_64px,
+                       &ICON_APP,
                        "Sign message",
                        NULL,  // No subtitle
                        "Sign message.",

src/ui/icon_nbgl.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#define VENOM_VARIANT     1
+#define EVERSCALE_VARIANT 2
+
+#if (VARIANT_ID == VENOM_VARIANT)
+#define ICON_APP C_app_venom_64px
+#else
+#define ICON_APP C_app_everscale_64px
+#endif

src/ui/menu_nbgl.c

@@ -4,6 +4,7 @@
 #include "nbgl_content.h"
 #include "nbgl_use_case.h"
 #include "menu.h"
+#include "icon_nbgl.h"
 
 //  -----------------------------------------------------------
 //  --------------------- SETTINGS MENU -----------------------
@@ -27,7 +28,7 @@ void app_quit(void) {
 
 void ui_main_menu(void) {
     nbgl_useCaseHomeAndSettings(APPNAME,
-                                &C_app_everscale_64px,
+                                &ICON_APP,
                                 NULL,
                                 INIT_HOME_PAGE,
                                 NULL,