d-bis/app-ethereum
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct icon for transactions

Browse Source
This commit is contained in:
Clement Bouvet
2023-02-07 18:06:45 +01:00
parent dbd346c58e
commit 847c1223bd
9 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src_nbgl/ui_approve_tx.c
+3 -3
View File
@@ -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);
}
}
src_nbgl/ui_confirm_parameter.c
+3 -2
View File
@@ -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) {
src_nbgl/ui_confirm_selector.c
+3 -2
View File
@@ -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) {
src_nbgl/ui_display_privacy.c
+3 -2
View File
@@ -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) {
src_nbgl/ui_sign_712.c
+2 -1
View File
@@ -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;
src_nbgl/ui_sign_712_v0.c
+3 -2
View File
@@ -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) {
src_nbgl/ui_stark_limit_order.c
+5 -3
View File
@@ -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) {
src_nbgl/ui_stark_transfer.c
+3 -2
View File
@@ -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
src_nbgl/ui_stark_unsafe_sign.c
+3 -2
View File
@@ -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) {