Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master (B2CA-1638) #20

Merged
merged 37 commits into from
May 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0443183
gitignore: update
sgliner-ledger Nov 2, 2022
23a03ed
glyphs: add icon
sgliner-ledger Nov 4, 2022
0eda679
tests: move unit tests to dedicated folder
sgliner-ledger Oct 27, 2022
ff42375
tests: add relevant files
sgliner-ledger Oct 28, 2022
4e6b6b8
main: add missing CLOSE_TRY
sgliner-ledger Mar 7, 2023
2c8e4ac
Stax: prepare Makefile and code base for new ui
sgliner-ledger Nov 2, 2022
5e2ad42
io_seproxyhal_touch: remove useless parameter
sgliner-ledger Nov 4, 2022
3de02e8
io_seproxyhal_touch: call ui_idle only for BAGL
sgliner-ledger Nov 4, 2022
d63d625
signPersonalMessage: display full hash for stax
sgliner-ledger Nov 4, 2022
c1c1e73
ui_common: add global variables for nbgl
sgliner-ledger Nov 4, 2022
08d2491
nbgl: add new ui
sgliner-ledger Nov 7, 2022
a4fef43
ci: update ci to use reusable workflows
sgliner-ledger Mar 7, 2023
cd18ce1
snapshots: add snapshots for all tests
sgliner-ledger Mar 7, 2023
1edc562
glyphs: removed unused files
sgliner-ledger Mar 9, 2023
88ad823
Merge pull request #10 from LedgerHQ/stax
sgliner-ledger Mar 9, 2023
f6cd17f
nbgl: change some wordings
sgliner-ledger Mar 27, 2023
388d750
Makefile: Bump version
sgliner-ledger Mar 27, 2023
4fd3d0b
snapshot: update for new wording
sgliner-ledger Mar 27, 2023
ef2c365
Merge pull request #11 from LedgerHQ/product-review
sgliner-ledger Mar 27, 2023
62c884f
icons: update with new design for stax
sgliner-ledger Jul 17, 2023
ae924d2
Stax: update settings according to latest guidelines
sgliner-ledger Jul 17, 2023
1bd1f19
snapshots: update with latest changes
sgliner-ledger Jul 17, 2023
6f9ab7c
Makefile: bump version
sgliner-ledger Jul 17, 2023
418d7db
Merge pull request #12 from LedgerHQ/update-icon
sgliner-ledger Jul 19, 2023
f0e7912
QR code source path is now used explicitly
apaillier-ledger Aug 3, 2023
abbfdcf
Merge pull request #13 from LedgerHQ/fix/apa/explicit_qrcode_source_path
sgliner-ledger Aug 7, 2023
c2bda8f
[auto]: add PR template
sgliner-ledger Nov 29, 2023
5e32963
stax: update screenshots
sgliner-ledger Dec 5, 2023
d85322a
ledger_app.toml: add manifest
sgliner-ledger Dec 5, 2023
852a4b0
Merge pull request #16 from LedgerHQ/fix-screenshots
sgliner-ledger Dec 6, 2023
6cf50e8
[auto] Update screenshot
Jan 10, 2024
0cfdb28
Merge pull request #17 from LedgerHQ/auto-update-screenshots
sgliner-ledger Jan 11, 2024
9e4aec7
[auto] Update screenshot
Feb 21, 2024
01687d7
Merge pull request #18 from LedgerHQ/auto-update-screenshots
sgliner-ledger Feb 21, 2024
321f213
[auto] Update screenshot
sgliner-ledger Feb 27, 2024
c256adc
[auto] Update screenshot
Apr 8, 2024
0fe667b
Merge pull request #19 from LedgerHQ/auto-update-screenshots
sgliner-ledger Apr 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
io_seproxyhal_touch: remove useless parameter
sgliner-ledger committed Mar 9, 2023

Unverified

The committer email address is not verified.
commit 5e2ad4290dfa7bf9d1a9ea4fa90487b481f30267
24 changes: 8 additions & 16 deletions src/ui_common.c
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@
#include "globals.h"
#include "utils.h"

unsigned int io_seproxyhal_touch_data_ok(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_data_ok(void) {
parserStatus_e txResult = USTREAM_FINISHED;
txResult = continueTx(&txContext);
switch (txResult) {
@@ -37,17 +36,15 @@ unsigned int io_seproxyhal_touch_data_ok(const bagl_element_t *e) {
return 0;
}

unsigned int io_seproxyhal_touch_data_cancel(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_data_cancel(void) {
reset_app_context();
io_seproxyhal_send_status(0x6985);
// Display back the original UX
ui_idle();
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_address_ok(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_address_ok(void) {
uint32_t tx = set_result_get_publicKey();
G_io_apdu_buffer[tx++] = 0x90;
G_io_apdu_buffer[tx++] = 0x00;
@@ -59,8 +56,7 @@ unsigned int io_seproxyhal_touch_address_ok(const bagl_element_t *e) {
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_address_cancel(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_address_cancel(void) {
G_io_apdu_buffer[0] = 0x69;
G_io_apdu_buffer[1] = 0x85;
reset_app_context();
@@ -71,8 +67,7 @@ unsigned int io_seproxyhal_touch_address_cancel(const bagl_element_t *e) {
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_tx_ok(void) {
uint8_t privateKeyData[32];
uint8_t signature[100];
cx_ecfp_private_key_t privateKey;
@@ -119,8 +114,7 @@ unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e) {
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_tx_cancel(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_tx_cancel(void) {
reset_app_context();
G_io_apdu_buffer[0] = 0x69;
G_io_apdu_buffer[1] = 0x85;
@@ -131,8 +125,7 @@ unsigned int io_seproxyhal_touch_tx_cancel(const bagl_element_t *e) {
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_signMessage_ok(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_signMessage_ok(void) {
uint8_t privateKeyData[32];
uint8_t signature[100];
cx_ecfp_private_key_t privateKey;
@@ -169,8 +162,7 @@ unsigned int io_seproxyhal_touch_signMessage_ok(const bagl_element_t *e) {
return 0; // do not redraw the widget
}

unsigned int io_seproxyhal_touch_signMessage_cancel(const bagl_element_t *e) {
UNUSED(e);
unsigned int io_seproxyhal_touch_signMessage_cancel(void) {
reset_app_context();
G_io_apdu_buffer[0] = 0x69;
G_io_apdu_buffer[1] = 0x85;
16 changes: 8 additions & 8 deletions src/ui_common.h
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ void ui_approval_celo_gateway_tx_flow(void);
void ui_approval_celo_data_warning_tx_flow(void);
void ui_approval_celo_tx_flow(void);

unsigned int io_seproxyhal_touch_data_ok(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_data_cancel(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_data_ok(void);
unsigned int io_seproxyhal_touch_data_cancel(void);

unsigned int io_seproxyhal_touch_address_ok(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_address_cancel(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_address_ok(void);
unsigned int io_seproxyhal_touch_address_cancel(void);

unsigned int io_seproxyhal_touch_tx_ok(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_tx_cancel(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_tx_ok(void);
unsigned int io_seproxyhal_touch_tx_cancel(void);

unsigned int io_seproxyhal_touch_signMessage_ok(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_signMessage_cancel(const bagl_element_t *e);
unsigned int io_seproxyhal_touch_signMessage_ok(void);
unsigned int io_seproxyhal_touch_signMessage_cancel(void);
20 changes: 10 additions & 10 deletions src/ui_flow.c
Original file line number Diff line number Diff line change
@@ -173,15 +173,15 @@ UX_STEP_NOCB(
UX_STEP_CB(
ux_display_public_flow_3_step,
pb,
io_seproxyhal_touch_address_ok(NULL),
io_seproxyhal_touch_address_ok(),
{
&C_icon_validate_14,
"Approve",
});
UX_STEP_CB(
ux_display_public_flow_4_step,
pb,
io_seproxyhal_touch_address_cancel(NULL),
io_seproxyhal_touch_address_cancel(),
{
&C_icon_crossmark,
"Reject",
@@ -214,15 +214,15 @@ UX_STEP_NOCB(
UX_STEP_CB(
ux_confirm_selector_flow_3_step,
pb,
io_seproxyhal_touch_data_ok(NULL),
io_seproxyhal_touch_data_ok(),
{
&C_icon_validate_14,
"Approve",
});
UX_STEP_CB(
ux_confirm_selector_flow_4_step,
pb,
io_seproxyhal_touch_data_cancel(NULL),
io_seproxyhal_touch_data_cancel(),
{
&C_icon_crossmark,
"Reject",
@@ -256,7 +256,7 @@ UX_STEP_NOCB(
UX_STEP_CB(
ux_confirm_parameter_flow_3_step,
pb,
io_seproxyhal_touch_data_ok(NULL),
io_seproxyhal_touch_data_ok(),
{
&C_icon_validate_14,
"Approve",
@@ -265,7 +265,7 @@ UX_STEP_CB(
UX_STEP_CB(
ux_confirm_parameter_flow_4_step,
pb,
io_seproxyhal_touch_data_cancel(NULL),
io_seproxyhal_touch_data_cancel(),
{
&C_icon_crossmark,
"Reject",
@@ -346,7 +346,7 @@ UX_STEP_NOCB(
UX_STEP_CB(
ux_approval_tx_5_step,
pbb,
io_seproxyhal_touch_tx_ok(NULL),
io_seproxyhal_touch_tx_ok(),
{
&C_icon_validate_14,
"Accept",
@@ -355,7 +355,7 @@ UX_STEP_CB(
UX_STEP_CB(
ux_approval_tx_6_step,
pb,
io_seproxyhal_touch_tx_cancel(NULL),
io_seproxyhal_touch_tx_cancel(),
{
&C_icon_crossmark,
"Reject",
@@ -485,7 +485,7 @@ UX_STEP_NOCB(
UX_STEP_CB(
ux_sign_flow_3_step,
pbb,
io_seproxyhal_touch_signMessage_ok(NULL),
io_seproxyhal_touch_signMessage_ok(),
{
&C_icon_validate_14,
"Sign",
@@ -495,7 +495,7 @@ UX_STEP_CB(
UX_STEP_CB(
ux_sign_flow_4_step,
pbb,
io_seproxyhal_touch_signMessage_cancel(NULL),
io_seproxyhal_touch_signMessage_cancel(),
{
&C_icon_crossmark,
"Cancel",