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

Renamed the stax shared buffer

Browse Source
This commit is contained in:
Alexandre Paillier
2023-07-06 16:02:40 +02:00
parent 7c83c15f9f
commit 04c9e890e5
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src_nbgl/ui_approve_tx.c
View File

@@ -229,7 +229,7 @@ static void reviewContinueCommon(void) {
useCaseTagValueList.smallCaseForValue = false;
useCaseTagValueList.wrapping = false;
infoLongPress.icon = get_tx_icon();
infoLongPress.text = tx_approval_context.fromPlugin ? staxSharedBuffer : SIGN(TEXT_TX);
infoLongPress.text = tx_approval_context.fromPlugin ? g_stax_shared_buffer : SIGN(TEXT_TX);
infoLongPress.longPressText = SIGN_BUTTON;
nbgl_useCaseStaticReview(&useCaseTagValueList, &infoLongPress, REJECT(TEXT_TX), reviewChoice);
}
@@ -239,11 +239,11 @@ static void prepare_sign_text(void) {
uint8_t sign_length = strlen("Sign");
uint8_t review_length = strlen("Review");
memmove(staxSharedBuffer, "Sign", sign_length);
memmove(staxSharedBuffer + sign_length,
staxSharedBuffer + review_length,
strlen(staxSharedBuffer) - review_length + 1);
strlcat(staxSharedBuffer, "?", sizeof(staxSharedBuffer));
memmove(g_stax_shared_buffer, "Sign", sign_length);
memmove(g_stax_shared_buffer + sign_length,
g_stax_shared_buffer + review_length,
strlen(g_stax_shared_buffer) - review_length + 1);
strlcat(g_stax_shared_buffer, "?", sizeof(g_stax_shared_buffer));
}
// Force operation to be lowercase
@@ -264,20 +264,20 @@ static void buildFirstPage(void) {
get_lowercase_operation(op_name, sizeof(op_name));
if (pluginType == EXTERNAL) {
snprintf(staxSharedBuffer,
sizeof(staxSharedBuffer),
snprintf(g_stax_shared_buffer,
sizeof(g_stax_shared_buffer),
"Review transaction\nto %s\non %s",
op_name,
strings.common.fullAddress);
} else {
snprintf(staxSharedBuffer,
sizeof(staxSharedBuffer),
snprintf(g_stax_shared_buffer,
sizeof(g_stax_shared_buffer),
"Review transaction\nto %s\n%s",
op_name,
strings.common.fullAddress);
}
nbgl_useCaseReviewStart(get_tx_icon(),
staxSharedBuffer,
g_stax_shared_buffer,
NULL,
REJECT(TEXT_TX),
reviewContinue,

23
src_nbgl/ui_confirm_parameter_selector.c
View File

@@ -32,12 +32,12 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) {
content->tagValueList.nbPairs = 1;
content->tagValueList.pairs = (nbgl_layoutTagValue_t *) &pair;
} else if (page == 1) {
snprintf(staxSharedBuffer,
sizeof(staxSharedBuffer),
snprintf(g_stax_shared_buffer,
sizeof(g_stax_shared_buffer),
"Confirm %s",
(confirm_type == PARAMETER_CONFIRMATION) ? "parameter" : "selector");
content->type = INFO_LONG_PRESS, content->infoLongPress.icon = get_app_icon(true);
content->infoLongPress.text = staxSharedBuffer;
content->infoLongPress.text = g_stax_shared_buffer;
content->infoLongPress.longPressText = "Hold to confirm";
} else {
return false;
@@ -47,20 +47,25 @@ static bool displayTransactionPage(uint8_t page, nbgl_pageContent_t *content) {
}
static void reviewContinue(void) {
snprintf(staxSharedBuffer,
sizeof(staxSharedBuffer),
snprintf(g_stax_shared_buffer,
sizeof(g_stax_shared_buffer),
"Reject %s",
(confirm_type == PARAMETER_CONFIRMATION) ? "parameter" : "selector");
nbgl_useCaseRegularReview(0, 2, staxSharedBuffer, NULL, displayTransactionPage, reviewChoice);
nbgl_useCaseRegularReview(0,
2,
g_stax_shared_buffer,
NULL,
displayTransactionPage,
reviewChoice);
}
static void buildScreen(void) {
snprintf(staxSharedBuffer,
sizeof(staxSharedBuffer),
snprintf(g_stax_shared_buffer,
sizeof(g_stax_shared_buffer),
"Verify %s",
(confirm_type == PARAMETER_CONFIRMATION) ? "parameter" : "selector");
nbgl_useCaseReviewStart(get_app_icon(true),
staxSharedBuffer,
g_stax_shared_buffer,
NULL,
REJECT_BUTTON,
reviewContinue,

6
src_nbgl/ui_idle.c
View File

@@ -5,7 +5,7 @@
#include "glyphs.h"
#include "network.h"
char staxSharedBuffer[SHARED_BUFFER_SIZE] = {0};
char g_stax_shared_buffer[SHARED_BUFFER_SIZE] = {0};
nbgl_page_t *pageContext;
#define FORMAT_PLUGIN "This app enables clear\nsigning transactions for\nthe %s dApp."
@@ -46,8 +46,8 @@ void ui_idle(void) {
app_name = caller_app->name;
if (caller_app->type == CALLER_TYPE_PLUGIN) {
snprintf(staxSharedBuffer, sizeof(staxSharedBuffer), FORMAT_PLUGIN, app_name);
tagline = staxSharedBuffer;
snprintf(g_stax_shared_buffer, sizeof(g_stax_shared_buffer), FORMAT_PLUGIN, app_name);
tagline = g_stax_shared_buffer;
}
} else { // Ethereum app
uint64_t mainnet_chain_id = ETHEREUM_MAINNET_CHAINID;

2
src_nbgl/ui_nbgl.h
View File

@@ -6,7 +6,7 @@
#include <shared_context.h>
#define SHARED_BUFFER_SIZE SHARED_CTX_FIELD_1_SIZE
extern char staxSharedBuffer[SHARED_BUFFER_SIZE];
extern char g_stax_shared_buffer[SHARED_BUFFER_SIZE];
extern nbgl_page_t* pageContext;

8
src_nbgl/ui_sign_message.c
View File

@@ -40,18 +40,18 @@ static bool display_message(nbgl_pageContent_t *content) {
bool reached;
if (g_action == UI_191_ACTION_ADVANCE_IN_MESSAGE) {
strncpy(staxSharedBuffer + eip191MessageIdx,
strncpy(g_stax_shared_buffer + eip191MessageIdx,
strings.tmp.tmp + stringsTmpTmpIdx,
SHARED_BUFFER_SIZE - eip191MessageIdx);
reached = nbgl_getTextMaxLenInNbLines(BAGL_FONT_INTER_MEDIUM_32px,
(char *) staxSharedBuffer,
(char *) g_stax_shared_buffer,
SCREEN_WIDTH - (2 * BORDER_MARGIN),
9,
&len);
stringsTmpTmpIdx = len - eip191MessageIdx;
eip191MessageIdx = len;
staxSharedBuffer[eip191MessageIdx] = '\0';
g_stax_shared_buffer[eip191MessageIdx] = '\0';
if (!reached && eip191MessageIdx < SHARED_BUFFER_SIZE) {
stringsTmpTmpIdx = 0;
@@ -65,7 +65,7 @@ static bool display_message(nbgl_pageContent_t *content) {
}
}
pair.value = staxSharedBuffer;
pair.value = g_stax_shared_buffer;
pair.item = "Message";
content->type = TAG_VALUE_LIST;
content->tagValueList.nbPairs = 1;