From 75e90170b41be1dc6596138ecf45f8a4a5f79881 Mon Sep 17 00:00:00 2001 From: Clement Bouvet Date: Thu, 8 Dec 2022 16:29:18 +0100 Subject: [PATCH] use correct icon for transactions --- src_nbgl/ui_approve_tx.c | 6 +++--- src_nbgl/ui_confirm_parameter.c | 5 +++-- src_nbgl/ui_confirm_selector.c | 5 +++-- src_nbgl/ui_display_privacy.c | 5 +++-- src_nbgl/ui_sign_712.c | 3 ++- src_nbgl/ui_sign_712_v0.c | 5 +++-- src_nbgl/ui_stark_limit_order.c | 8 +++++--- src_nbgl/ui_stark_transfer.c | 5 +++-- src_nbgl/ui_stark_unsafe_sign.c | 5 +++-- 9 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c index 60e974bb..c4664b59 100644 --- a/src_nbgl/ui_approve_tx.c +++ b/src_nbgl/ui_approve_tx.c @@ -191,7 +191,7 @@ static void reviewContinueCommon(void) { useCaseTagValueList.nbPairs = nbPairs; ///< number of pairs in pairs array useCaseTagValueList.smallCaseForValue = false; useCaseTagValueList.wrapping = false; - infoLongPress.icon = &ICONGLYPH; + infoLongPress.icon = get_app_chain_icon(); infoLongPress.text = tx_approval_context.fromPlugin ? transaction_type : "Review transaction"; infoLongPress.longPressText = "Hold to sign"; nbgl_useCaseStaticReview(&useCaseTagValueList, &infoLongPress, "Reject transaction", reviewChoice); @@ -202,9 +202,9 @@ static void buildFirstPage(void) { if (tx_approval_context.fromPlugin) { plugin_ui_get_id(); SPRINTF(transaction_type, "Review %s\ntransaction:\n%s", strings.common.fullAddress,strings.common.fullAmount); - nbgl_useCaseReviewStart(&ICONGLYPH, transaction_type, NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion); + nbgl_useCaseReviewStart(get_app_chain_icon(), transaction_type, NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion); } else { - nbgl_useCaseReviewStart(&ICONGLYPH, "Review transaction", NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Review transaction", NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion); } } diff --git a/src_nbgl/ui_confirm_parameter.c b/src_nbgl/ui_confirm_parameter.c index 62eb2f02..2f649f54 100644 --- a/src_nbgl/ui_confirm_parameter.c +++ b/src_nbgl/ui_confirm_parameter.c @@ -1,5 +1,6 @@ #include "common_ui.h" #include "ui_nbgl.h" +#include "network.h" static nbgl_layoutTagValue_t tlv; @@ -30,7 +31,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Confirm parameter"; content->infoLongPress.longPressText = "Hold to confirm"; } @@ -47,7 +48,7 @@ static void reviewContinue(void) { } static void buildScreen(void) { - nbgl_useCaseReviewStart(&ICONGLYPH, "Verify parameter", NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Verify parameter", NULL, "Reject", reviewContinue, reviewReject); } void ui_confirm_parameter(void) { diff --git a/src_nbgl/ui_confirm_selector.c b/src_nbgl/ui_confirm_selector.c index 30e3ab8b..f6b52a9b 100644 --- a/src_nbgl/ui_confirm_selector.c +++ b/src_nbgl/ui_confirm_selector.c @@ -1,5 +1,6 @@ #include "common_ui.h" #include "ui_nbgl.h" +#include "network.h" static nbgl_layoutTagValue_t tlv; @@ -30,7 +31,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Confirm selector"; content->infoLongPress.longPressText = "Hold to confirm"; } @@ -47,7 +48,7 @@ static void reviewContinue(void) { } static void buildScreen(void) { - nbgl_useCaseReviewStart(&ICONGLYPH, "Verify selector", NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Verify selector", NULL, "Reject", reviewContinue, reviewReject); } void ui_confirm_selector(void) { diff --git a/src_nbgl/ui_display_privacy.c b/src_nbgl/ui_display_privacy.c index 8433e28c..b48bf110 100644 --- a/src_nbgl/ui_display_privacy.c +++ b/src_nbgl/ui_display_privacy.c @@ -2,6 +2,7 @@ #include "ui_nbgl.h" #include "ui_callbacks.h" #include "nbgl_use_case.h" +#include "network.h" static nbgl_layoutTagValue_t tlv[2]; static char* review_string; @@ -37,7 +38,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = review_string; content->infoLongPress.longPressText = "Hold to approve"; } @@ -53,7 +54,7 @@ static void reviewContinue(void) { } static void buildFirstPage(void) { - nbgl_useCaseReviewStart(&ICONGLYPH, review_string, NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), review_string, NULL, "Reject", reviewContinue, reviewReject); } void ui_display_privacy_public_key(void) { diff --git a/src_nbgl/ui_sign_712.c b/src_nbgl/ui_sign_712.c index dec43079..afd1002b 100644 --- a/src_nbgl/ui_sign_712.c +++ b/src_nbgl/ui_sign_712.c @@ -3,6 +3,7 @@ #include "ui_logic.h" #include "common_712.h" #include "nbgl_use_case.h" +#include "network.h" // 4 pairs of tag/value to display static nbgl_layoutTagValue_t tlv; @@ -25,7 +26,7 @@ static void reviewChoice(bool confirm) { static bool displaySignPage(uint8_t page, nbgl_pageContent_t *content) { (void)page; content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Sign typed message"; content->infoLongPress.longPressText = "Hold to sign"; return true; diff --git a/src_nbgl/ui_sign_712_v0.c b/src_nbgl/ui_sign_712_v0.c index 5bc32e57..6671573c 100644 --- a/src_nbgl/ui_sign_712_v0.c +++ b/src_nbgl/ui_sign_712_v0.c @@ -1,6 +1,7 @@ #include "common_ui.h" #include "ui_nbgl.h" #include "common_712.h" +#include "network.h" static nbgl_layoutTagValue_t tlv[2]; @@ -43,7 +44,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Sign typed message"; content->infoLongPress.longPressText = "Hold to sign"; } @@ -59,7 +60,7 @@ static void reviewContinue(void) { static void buildFirstPage(void) { - nbgl_useCaseReviewStart(&ICONGLYPH, "Sign typed message", NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Sign typed message", NULL, "Reject", reviewContinue, reviewReject); } void ui_sign_712_v0(void) { diff --git a/src_nbgl/ui_stark_limit_order.c b/src_nbgl/ui_stark_limit_order.c index 9fe36c72..9bc4ce27 100644 --- a/src_nbgl/ui_stark_limit_order.c +++ b/src_nbgl/ui_stark_limit_order.c @@ -2,11 +2,13 @@ #include "ui_nbgl.h" #include "ui_callbacks.h" #include "nbgl_use_case.h" +#include "network.h" -static nbgl_layoutTagValue_t tlv[3]; #ifdef HAVE_STARKWARE +static nbgl_layoutTagValue_t tlv[3]; + static void reviewReject(void) { io_seproxyhal_touch_tx_cancel(NULL); ui_idle(); @@ -40,7 +42,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Review stark limit order"; content->infoLongPress.longPressText = "Hold to sign"; } @@ -57,7 +59,7 @@ static void reviewContinue(void) { static void buildFirstPage(void) { - nbgl_useCaseReviewStart(&ICONGLYPH, "Review stark limit order", NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Review stark limit order", NULL, "Reject", reviewContinue, reviewReject); } void ui_stark_limit_order(void) { diff --git a/src_nbgl/ui_stark_transfer.c b/src_nbgl/ui_stark_transfer.c index 81cba7b4..f5a6914c 100644 --- a/src_nbgl/ui_stark_transfer.c +++ b/src_nbgl/ui_stark_transfer.c @@ -4,6 +4,7 @@ #include "ui_nbgl.h" #include "starkDisplayUtils.h" #include "ethUtils.h" +#include "network.h" #ifdef HAVE_STARKWARE @@ -85,7 +86,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } if (page == 2) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Review transaction"; content->infoLongPress.longPressText = "Hold to sign"; } @@ -114,7 +115,7 @@ void ui_stark_transfer(bool selfTransfer, bool conditional) { subTitle = "Transfer"; } } - nbgl_useCaseReviewStart(&ICONGLYPH, "Review stark transaction", subTitle, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(), "Review stark transaction", subTitle, "Reject", reviewContinue, reviewReject); } #endif // #ifdef HAVE_STARKWARE diff --git a/src_nbgl/ui_stark_unsafe_sign.c b/src_nbgl/ui_stark_unsafe_sign.c index 755dc2e4..3f1e25a1 100644 --- a/src_nbgl/ui_stark_unsafe_sign.c +++ b/src_nbgl/ui_stark_unsafe_sign.c @@ -3,6 +3,7 @@ #include "ui_nbgl.h" #include "ui_callbacks.h" #include "nbgl_use_case.h" +#include "network.h" #ifdef HAVE_STARKWARE @@ -43,7 +44,7 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) { } else if (page == 1) { content->type = INFO_LONG_PRESS, - content->infoLongPress.icon = &ICONGLYPH; + content->infoLongPress.icon = get_app_chain_icon(); content->infoLongPress.text = "Unsafe Stark Sign"; content->infoLongPress.longPressText = "Hold to sign"; } @@ -59,7 +60,7 @@ static void reviewContinue(void) { } static void buildFirstPage(void) { - nbgl_useCaseReviewStart(&ICONGLYPH,"Unsafe Stark Sign", NULL, "Reject", reviewContinue, reviewReject); + nbgl_useCaseReviewStart(get_app_chain_icon(),"Unsafe Stark Sign", NULL, "Reject", reviewContinue, reviewReject); } void ui_stark_unsafe_sign(void) {