From 1f9ef3484556edb890ec030a84bdc60c07694dca Mon Sep 17 00:00:00 2001 From: TamtamHero <10632523+TamtamHero@users.noreply.github.com> Date: Tue, 20 Oct 2020 15:40:31 +0200 Subject: [PATCH] Use recommanded UX macros from recents SDKs --- src/ui_flow.c | 25 ++++---- .../erc20_approval/ui_flow_erc20_approval.c | 21 ++++--- .../getPublicKey/ui_flow_getPublicKey.c | 15 +++-- .../signMessage/ui_flow_signMessage.c | 15 +++-- .../ui_flow_signMessage712.c | 13 ++--- src_features/signTx/ui_flow_signTx.c | 58 +++++++++---------- .../ui_flow_stark_deposit.c | 17 +++--- .../ui_flow_stark_escape.c | 17 +++--- .../ui_flow_stark_register.c | 17 +++--- .../ui_flow_stark_verify_escape.c | 17 +++--- .../ui_flow_stark_verifyVaultId.c | 15 +++-- .../ui_flow_stark_withdrawal.c | 17 +++--- .../ui_flow_stark_getPublicKey.c | 15 +++-- src_features/stark_sign/ui_flow_stark_sign.c | 53 ++++++++--------- 14 files changed, 148 insertions(+), 167 deletions(-) diff --git a/src/ui_flow.c b/src/ui_flow.c index b83f6ae..3b57d02 100644 --- a/src/ui_flow.c +++ b/src/ui_flow.c @@ -6,7 +6,7 @@ void switch_settings_contract_data(void); void switch_settings_display_data(void); ////////////////////////////////////////////////////////////////////// -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_idle_flow_1_step, nn, //pnn, { @@ -14,14 +14,14 @@ UX_FLOW_DEF_NOCB( "Application", "is ready", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_idle_flow_2_step, bn, { "Version", APPVERSION, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_idle_flow_3_step, pb, display_settings(), @@ -29,7 +29,7 @@ UX_FLOW_DEF_VALID( &C_icon_eye, "Settings", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_idle_flow_4_step, pb, os_sched_exit(-1), @@ -47,7 +47,7 @@ UX_FLOW(ux_idle_flow, #if defined(TARGET_NANOS) -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_settings_flow_1_step, bnnn_paging, switch_settings_contract_data(), @@ -56,7 +56,7 @@ UX_FLOW_DEF_VALID( .text = strings.common.fullAddress, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_settings_flow_2_step, bnnn_paging, switch_settings_display_data(), @@ -67,7 +67,7 @@ UX_FLOW_DEF_VALID( #else -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_settings_flow_1_step, bnnn, switch_settings_contract_data(), @@ -78,7 +78,7 @@ UX_FLOW_DEF_VALID( strings.common.fullAddress, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_settings_flow_2_step, bnnn, switch_settings_display_data(), @@ -91,7 +91,7 @@ UX_FLOW_DEF_VALID( #endif -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_settings_flow_3_step, pb, ui_idle(), @@ -100,12 +100,11 @@ UX_FLOW_DEF_VALID( "Back", }); -const ux_flow_step_t * const ux_settings_flow [] = { +UX_FLOW(ux_settings_flow, &ux_settings_flow_1_step, &ux_settings_flow_2_step, - &ux_settings_flow_3_step, - FLOW_END_STEP, -}; + &ux_settings_flow_3_step +); void display_settings() { strcpy(strings.common.fullAddress, (N_storage.dataAllowed ? "Allowed" : "NOT Allowed")); diff --git a/src_features/erc20_approval/ui_flow_erc20_approval.c b/src_features/erc20_approval/ui_flow_erc20_approval.c index 9851b21..a6ac814 100644 --- a/src_features/erc20_approval/ui_flow_erc20_approval.c +++ b/src_features/erc20_approval/ui_flow_erc20_approval.c @@ -1,7 +1,7 @@ #include "shared_context.h" #include "ui_callbacks.h" -UX_FLOW_DEF_NOCB(ux_approval_allowance_1_step, +UX_STEP_NOCB(ux_approval_allowance_1_step, pnn, { &C_icon_eye, @@ -9,7 +9,7 @@ UX_FLOW_DEF_NOCB(ux_approval_allowance_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_allowance_2_step, bnnn_paging, { @@ -17,7 +17,7 @@ UX_FLOW_DEF_NOCB( .text = " " }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_allowance_3_step, bnnn_paging, { @@ -25,7 +25,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.fullAddress, }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_allowance_4_step, bnnn_paging, { @@ -33,7 +33,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.fullAmount }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_allowance_5_step, bnnn_paging, { @@ -41,7 +41,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_allowance_6_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -51,7 +51,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_allowance_7_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -60,14 +60,13 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_allowance_flow [] = { +UX_FLOW(ux_approval_allowance_flow, &ux_approval_allowance_1_step, &ux_approval_allowance_2_step, &ux_approval_allowance_3_step, &ux_approval_allowance_4_step, &ux_approval_allowance_5_step, &ux_approval_allowance_6_step, - &ux_approval_allowance_7_step, - FLOW_END_STEP, -}; + &ux_approval_allowance_7_step +); diff --git a/src_features/getPublicKey/ui_flow_getPublicKey.c b/src_features/getPublicKey/ui_flow_getPublicKey.c index 4354d9c..fee2f18 100644 --- a/src_features/getPublicKey/ui_flow_getPublicKey.c +++ b/src_features/getPublicKey/ui_flow_getPublicKey.c @@ -1,7 +1,7 @@ #include "shared_context.h" #include "ui_callbacks.h" -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_display_public_flow_1_step, pnn, { @@ -9,14 +9,14 @@ UX_FLOW_DEF_NOCB( "Verify", "address", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_display_public_flow_2_step, bnnn_paging, { .title = "Address", .text = strings.common.fullAddress, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_display_public_flow_3_step, pb, io_seproxyhal_touch_address_ok(NULL), @@ -24,7 +24,7 @@ UX_FLOW_DEF_VALID( &C_icon_validate_14, "Approve", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_display_public_flow_4_step, pb, io_seproxyhal_touch_address_cancel(NULL), @@ -33,10 +33,9 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_display_public_flow [] = { +UX_FLOW(ux_display_public_flow, &ux_display_public_flow_1_step, &ux_display_public_flow_2_step, &ux_display_public_flow_3_step, - &ux_display_public_flow_4_step, - FLOW_END_STEP, -}; + &ux_display_public_flow_4_step +); diff --git a/src_features/signMessage/ui_flow_signMessage.c b/src_features/signMessage/ui_flow_signMessage.c index 26f8589..fe47dc2 100644 --- a/src_features/signMessage/ui_flow_signMessage.c +++ b/src_features/signMessage/ui_flow_signMessage.c @@ -1,7 +1,7 @@ #include "shared_context.h" #include "ui_callbacks.h" -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_sign_flow_1_step, pnn, { @@ -9,14 +9,14 @@ UX_FLOW_DEF_NOCB( "Sign", "message", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_sign_flow_2_step, bnnn_paging, { .title = "Message hash", .text = strings.tmp.tmp, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_sign_flow_3_step, pbb, io_seproxyhal_touch_signMessage_ok(NULL), @@ -25,7 +25,7 @@ UX_FLOW_DEF_VALID( "Sign", "message", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_sign_flow_4_step, pbb, io_seproxyhal_touch_signMessage_cancel(NULL), @@ -35,11 +35,10 @@ UX_FLOW_DEF_VALID( "signature", }); -const ux_flow_step_t * const ux_sign_flow [] = { +UX_FLOW(ux_sign_flow, &ux_sign_flow_1_step, &ux_sign_flow_2_step, &ux_sign_flow_3_step, - &ux_sign_flow_4_step, - FLOW_END_STEP, -}; + &ux_sign_flow_4_step +); diff --git a/src_features/signMessageEIP712/ui_flow_signMessage712.c b/src_features/signMessageEIP712/ui_flow_signMessage712.c index c6f0df8..103fa39 100644 --- a/src_features/signMessageEIP712/ui_flow_signMessage712.c +++ b/src_features/signMessageEIP712/ui_flow_signMessage712.c @@ -9,7 +9,7 @@ void prepare_message_hash_v0() { snprintf(strings.tmp.tmp, 70, "0x%.*H", 32, tmpCtx.messageSigningContext712.messageHash); } -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_sign_712_v0_flow_1_step, pnn, { @@ -33,7 +33,7 @@ UX_STEP_NOCB_INIT( .title = "Message hash", .text = strings.tmp.tmp, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_sign_712_v0_flow_4_step, pbb, io_seproxyhal_touch_signMessage712_v0_ok(NULL), @@ -42,7 +42,7 @@ UX_FLOW_DEF_VALID( "Sign", "message", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_sign_712_v0_flow_5_step, pbb, io_seproxyhal_touch_signMessage712_v0_cancel(NULL), @@ -52,12 +52,11 @@ UX_FLOW_DEF_VALID( "signature", }); -const ux_flow_step_t * const ux_sign_712_v0_flow [] = { +UX_FLOW(ux_sign_712_v0_flow, &ux_sign_712_v0_flow_1_step, &ux_sign_712_v0_flow_2_step, &ux_sign_712_v0_flow_3_step, &ux_sign_712_v0_flow_4_step, - &ux_sign_712_v0_flow_5_step, - FLOW_END_STEP, -}; + &ux_sign_712_v0_flow_5_step +); diff --git a/src_features/signTx/ui_flow_signTx.c b/src_features/signTx/ui_flow_signTx.c index c6e7323..6a65e1f 100644 --- a/src_features/signTx/ui_flow_signTx.c +++ b/src_features/signTx/ui_flow_signTx.c @@ -1,7 +1,7 @@ #include "shared_context.h" #include "ui_callbacks.h" -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_confirm_selector_flow_1_step, pnn, { @@ -10,14 +10,14 @@ UX_FLOW_DEF_NOCB( "selector", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_confirm_selector_flow_2_step, bn, { "Selector", strings.tmp.tmp }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_confirm_selector_flow_3_step, pb, io_seproxyhal_touch_data_ok(NULL), @@ -25,7 +25,7 @@ UX_FLOW_DEF_VALID( &C_icon_validate_14, "Approve", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_confirm_selector_flow_4_step, pb, io_seproxyhal_touch_data_cancel(NULL), @@ -34,16 +34,15 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_confirm_selector_flow [] = { + UX_FLOW(ux_confirm_selector_flow, &ux_confirm_selector_flow_1_step, &ux_confirm_selector_flow_2_step, &ux_confirm_selector_flow_3_step, - &ux_confirm_selector_flow_4_step, - FLOW_END_STEP, -}; + &ux_confirm_selector_flow_4_step +); ////////////////////////////////////////////////////////////////////// -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_confirm_parameter_flow_1_step, pnn, { @@ -51,14 +50,14 @@ UX_FLOW_DEF_NOCB( "Verify", strings.tmp.tmp2 }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_confirm_parameter_flow_2_step, bnnn_paging, { .title = "Parameter", .text = strings.tmp.tmp, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_confirm_parameter_flow_3_step, pb, io_seproxyhal_touch_data_ok(NULL), @@ -66,7 +65,7 @@ UX_FLOW_DEF_VALID( &C_icon_validate_14, "Approve", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_confirm_parameter_flow_4_step, pb, io_seproxyhal_touch_data_cancel(NULL), @@ -75,44 +74,43 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_confirm_parameter_flow [] = { +UX_FLOW(ux_confirm_parameter_flow, &ux_confirm_parameter_flow_1_step, &ux_confirm_parameter_flow_2_step, &ux_confirm_parameter_flow_3_step, - &ux_confirm_parameter_flow_4_step, - FLOW_END_STEP, -}; + &ux_confirm_parameter_flow_4_step +); ////////////////////////////////////////////////////////////////////// -UX_FLOW_DEF_NOCB(ux_approval_tx_1_step, +UX_STEP_NOCB(ux_approval_tx_1_step, pnn, { &C_icon_eye, "Review", "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_tx_2_step, bnnn_paging, { .title = "Amount", .text = strings.common.fullAmount }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_tx_3_step, bnnn_paging, { .title = "Address", .text = strings.common.fullAddress, }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_tx_4_step, bnnn_paging, { .title = "Max Fees", .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_tx_5_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -121,7 +119,7 @@ UX_FLOW_DEF_VALID( "Accept", "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_tx_6_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -130,7 +128,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -UX_FLOW_DEF_NOCB(ux_approval_tx_data_warning_step, +UX_STEP_NOCB(ux_approval_tx_data_warning_step, pbb, { &C_icon_warning, @@ -139,23 +137,21 @@ UX_FLOW_DEF_NOCB(ux_approval_tx_data_warning_step, }); -const ux_flow_step_t * const ux_approval_tx_flow [] = { +UX_FLOW(ux_approval_tx_flow, &ux_approval_tx_1_step, &ux_approval_tx_2_step, &ux_approval_tx_3_step, &ux_approval_tx_4_step, &ux_approval_tx_5_step, - &ux_approval_tx_6_step, - FLOW_END_STEP, -}; + &ux_approval_tx_6_step +); -const ux_flow_step_t * const ux_approval_tx_data_warning_flow [] = { +UX_FLOW(ux_approval_tx_data_warning_flow, &ux_approval_tx_1_step, &ux_approval_tx_data_warning_step, &ux_approval_tx_2_step, &ux_approval_tx_3_step, &ux_approval_tx_4_step, &ux_approval_tx_5_step, - &ux_approval_tx_6_step, - FLOW_END_STEP, -}; \ No newline at end of file + &ux_approval_tx_6_step +); \ No newline at end of file diff --git a/src_features/stark_contract_deposit/ui_flow_stark_deposit.c b/src_features/stark_contract_deposit/ui_flow_stark_deposit.c index 49f52db..4ce69cf 100644 --- a/src_features/stark_contract_deposit/ui_flow_stark_deposit.c +++ b/src_features/stark_contract_deposit/ui_flow_stark_deposit.c @@ -39,7 +39,7 @@ void prepare_deposit_5() { adjustDecimals((char*)(G_io_apdu_buffer + 100), strlen((char*)(G_io_apdu_buffer + 100)), strings.common.fullAmount + strlen(ticker), 50 - strlen(ticker), decimals); } -UX_FLOW_DEF_NOCB(ux_approval_starkware_deposit_1_step, +UX_STEP_NOCB(ux_approval_starkware_deposit_1_step, pnn, { &C_icon_eye, @@ -47,7 +47,7 @@ UX_FLOW_DEF_NOCB(ux_approval_starkware_deposit_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_deposit_2_step, bnnn_paging, { @@ -83,7 +83,7 @@ UX_STEP_NOCB_INIT( }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_deposit_6_step, bnnn_paging, { @@ -91,7 +91,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_deposit_7_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -101,7 +101,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_deposit_8_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -110,7 +110,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_deposit_flow [] = { +UX_FLOW(ux_approval_starkware_deposit_flow, &ux_approval_starkware_deposit_1_step, &ux_approval_starkware_deposit_2_step, &ux_approval_starkware_deposit_3_step, @@ -118,9 +118,8 @@ const ux_flow_step_t * const ux_approval_starkware_deposit_flow [] = { &ux_approval_starkware_deposit_5_step, &ux_approval_starkware_deposit_6_step, &ux_approval_starkware_deposit_7_step, - &ux_approval_starkware_deposit_8_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_deposit_8_step +); #endif diff --git a/src_features/stark_contract_escape/ui_flow_stark_escape.c b/src_features/stark_contract_escape/ui_flow_stark_escape.c index 2ebc61e..7811125 100644 --- a/src_features/stark_contract_escape/ui_flow_stark_escape.c +++ b/src_features/stark_contract_escape/ui_flow_stark_escape.c @@ -41,7 +41,7 @@ void prepare_escape_6() { snprintf(strings.common.fullAddress, 10, "%d", U4BE(dataContext.tokenContext.data, 4 + 32 - 4)); } -UX_FLOW_DEF_NOCB(ux_approval_starkware_escape_1_step, +UX_STEP_NOCB(ux_approval_starkware_escape_1_step, pnn, { &C_icon_eye, @@ -49,7 +49,7 @@ UX_FLOW_DEF_NOCB(ux_approval_starkware_escape_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_escape_2_step, bnnn_paging, { @@ -93,7 +93,7 @@ UX_STEP_NOCB_INIT( .text = strings.common.fullAddress }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_escape_7_step, bnnn_paging, { @@ -101,7 +101,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_escape_8_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -111,7 +111,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_escape_9_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -120,7 +120,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_escape_flow [] = { +UX_FLOW(ux_approval_starkware_escape_flow, &ux_approval_starkware_escape_1_step, &ux_approval_starkware_escape_2_step, &ux_approval_starkware_escape_3_step, @@ -129,8 +129,7 @@ const ux_flow_step_t * const ux_approval_starkware_escape_flow [] = { &ux_approval_starkware_escape_6_step, &ux_approval_starkware_escape_7_step, &ux_approval_starkware_escape_8_step, - &ux_approval_starkware_escape_9_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_escape_9_step +); #endif diff --git a/src_features/stark_contract_register/ui_flow_stark_register.c b/src_features/stark_contract_register/ui_flow_stark_register.c index 34f5fce..8080585 100644 --- a/src_features/stark_contract_register/ui_flow_stark_register.c +++ b/src_features/stark_contract_register/ui_flow_stark_register.c @@ -37,7 +37,7 @@ void prepare_register_5() { snprintf(strings.tmp.tmp, 70, "0x%.*H", 32, dataContext.tokenContext.data + 4); } -UX_FLOW_DEF_NOCB(ux_approval_starkware_register_1_step, +UX_STEP_NOCB(ux_approval_starkware_register_1_step, pnn, { &C_icon_eye, @@ -45,7 +45,7 @@ UX_FLOW_DEF_NOCB(ux_approval_starkware_register_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_register_2_step, bnnn_paging, { @@ -81,7 +81,7 @@ UX_STEP_NOCB_INIT( }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_register_6_step, bnnn_paging, { @@ -89,7 +89,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_register_7_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -99,7 +99,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_register_8_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -108,7 +108,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_register_flow [] = { +UX_FLOW(ux_approval_starkware_register_flow, &ux_approval_starkware_register_1_step, &ux_approval_starkware_register_2_step, &ux_approval_starkware_register_3_step, @@ -116,9 +116,8 @@ const ux_flow_step_t * const ux_approval_starkware_register_flow [] = { &ux_approval_starkware_register_5_step, &ux_approval_starkware_register_6_step, &ux_approval_starkware_register_7_step, - &ux_approval_starkware_register_8_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_register_8_step +); #endif diff --git a/src_features/stark_contract_verifyEscape/ui_flow_stark_verify_escape.c b/src_features/stark_contract_verifyEscape/ui_flow_stark_verify_escape.c index 8ac6498..9dd732b 100644 --- a/src_features/stark_contract_verifyEscape/ui_flow_stark_verify_escape.c +++ b/src_features/stark_contract_verifyEscape/ui_flow_stark_verify_escape.c @@ -12,7 +12,7 @@ void prepare_verify_escape_3() { strings.common.fullAddress[42] = '\0'; } -UX_FLOW_DEF_NOCB(ux_approval_starkware_verify_escape_1_step, +UX_STEP_NOCB(ux_approval_starkware_verify_escape_1_step, pnn, { &C_icon_eye, @@ -20,7 +20,7 @@ UX_FLOW_DEF_NOCB(ux_approval_starkware_verify_escape_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_verify_escape_2_step, bnnn_paging, { @@ -37,7 +37,7 @@ UX_STEP_NOCB_INIT( .text = strings.common.fullAddress, }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_verify_escape_4_step, bnnn_paging, { @@ -45,7 +45,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_verify_escape_5_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -55,7 +55,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_verify_escape_6_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -64,14 +64,13 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_verify_escape_flow [] = { +UX_FLOW(ux_approval_starkware_verify_escape_flow, &ux_approval_starkware_verify_escape_1_step, &ux_approval_starkware_verify_escape_2_step, &ux_approval_starkware_verify_escape_3_step, &ux_approval_starkware_verify_escape_4_step, &ux_approval_starkware_verify_escape_5_step, - &ux_approval_starkware_verify_escape_6_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_verify_escape_6_step +); #endif diff --git a/src_features/stark_contract_verifyVaultId/ui_flow_stark_verifyVaultId.c b/src_features/stark_contract_verifyVaultId/ui_flow_stark_verifyVaultId.c index 8838881..be3d529 100644 --- a/src_features/stark_contract_verifyVaultId/ui_flow_stark_verifyVaultId.c +++ b/src_features/stark_contract_verifyVaultId/ui_flow_stark_verifyVaultId.c @@ -38,7 +38,7 @@ void prepare_verify_vault_id_4() { snprintf(strings.common.fullAddress, 10, "%d", U4BE(dataContext.tokenContext.data, 4 + offset + 32 - 4)); } -UX_FLOW_DEF_NOCB(ux_approval_starkware_verify_vault_id_1_step, +UX_STEP_NOCB(ux_approval_starkware_verify_vault_id_1_step, pnn, { &C_icon_eye, @@ -74,7 +74,7 @@ UX_STEP_NOCB_INIT( }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_verify_vault_id_5_step, bnnn_paging, { @@ -82,7 +82,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_verify_vault_id_6_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -92,7 +92,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_verify_vault_id_7_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -101,16 +101,15 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_verify_vault_id_flow [] = { +UX_FLOW(ux_approval_starkware_verify_vault_id_flow, &ux_approval_starkware_verify_vault_id_1_step, &ux_approval_starkware_verify_vault_id_2_step, &ux_approval_starkware_verify_vault_id_3_step, &ux_approval_starkware_verify_vault_id_4_step, &ux_approval_starkware_verify_vault_id_5_step, &ux_approval_starkware_verify_vault_id_6_step, - &ux_approval_starkware_verify_vault_id_7_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_verify_vault_id_7_step +); #endif diff --git a/src_features/stark_contract_withdrawal/ui_flow_stark_withdrawal.c b/src_features/stark_contract_withdrawal/ui_flow_stark_withdrawal.c index 7ec0c29..676bca2 100644 --- a/src_features/stark_contract_withdrawal/ui_flow_stark_withdrawal.c +++ b/src_features/stark_contract_withdrawal/ui_flow_stark_withdrawal.c @@ -24,7 +24,7 @@ void prepare_withdraw_5() { strcpy(strings.common.fullAmount, ticker); } -UX_FLOW_DEF_NOCB(ux_approval_starkware_withdraw_1_step, +UX_STEP_NOCB(ux_approval_starkware_withdraw_1_step, pnn, { &C_icon_eye, @@ -32,7 +32,7 @@ UX_FLOW_DEF_NOCB(ux_approval_starkware_withdraw_1_step, "transaction", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_withdraw_2_step, bnnn_paging, { @@ -68,7 +68,7 @@ UX_STEP_NOCB_INIT( }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_approval_starkware_withdraw_6_step, bnnn_paging, { @@ -76,7 +76,7 @@ UX_FLOW_DEF_NOCB( .text = strings.common.maxFee, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_withdraw_7_step, pbb, io_seproxyhal_touch_tx_ok(NULL), @@ -86,7 +86,7 @@ UX_FLOW_DEF_VALID( "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_approval_starkware_withdraw_8_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -95,7 +95,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_approval_starkware_withdraw_flow [] = { +UX_FLOW(ux_approval_starkware_withdraw_flow, &ux_approval_starkware_withdraw_1_step, &ux_approval_starkware_withdraw_2_step, &ux_approval_starkware_withdraw_3_step, @@ -103,8 +103,7 @@ const ux_flow_step_t * const ux_approval_starkware_withdraw_flow [] = { &ux_approval_starkware_withdraw_5_step, &ux_approval_starkware_withdraw_6_step, &ux_approval_starkware_withdraw_7_step, - &ux_approval_starkware_withdraw_8_step, - FLOW_END_STEP, -}; + &ux_approval_starkware_withdraw_8_step +); #endif diff --git a/src_features/stark_getPublicKey/ui_flow_stark_getPublicKey.c b/src_features/stark_getPublicKey/ui_flow_stark_getPublicKey.c index 4c13d88..6ac04e8 100644 --- a/src_features/stark_getPublicKey/ui_flow_stark_getPublicKey.c +++ b/src_features/stark_getPublicKey/ui_flow_stark_getPublicKey.c @@ -5,7 +5,7 @@ unsigned int io_seproxyhal_touch_stark_pubkey_ok(const bagl_element_t *e); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_display_stark_public_flow_1_step, pnn, { @@ -13,14 +13,14 @@ UX_FLOW_DEF_NOCB( "Verify", "Stark key", }); -UX_FLOW_DEF_NOCB( +UX_STEP_NOCB( ux_display_stark_public_flow_2_step, bnnn_paging, { .title = "Stark Key", .text = strings.tmp.tmp, }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_display_stark_public_flow_3_step, pb, io_seproxyhal_touch_stark_pubkey_ok(NULL), @@ -28,7 +28,7 @@ UX_FLOW_DEF_VALID( &C_icon_validate_14, "Approve", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_display_stark_public_flow_4_step, pb, io_seproxyhal_touch_address_cancel(NULL), @@ -37,13 +37,12 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_display_stark_public_flow [] = { +UX_FLOW(ux_display_stark_public_flow, &ux_display_stark_public_flow_1_step, &ux_display_stark_public_flow_2_step, &ux_display_stark_public_flow_3_step, - &ux_display_stark_public_flow_4_step, - FLOW_END_STEP, -}; + &ux_display_stark_public_flow_4_step +); #endif diff --git a/src_features/stark_sign/ui_flow_stark_sign.c b/src_features/stark_sign/ui_flow_stark_sign.c index f4ac15c..287b151 100644 --- a/src_features/stark_sign/ui_flow_stark_sign.c +++ b/src_features/stark_sign/ui_flow_stark_sign.c @@ -5,7 +5,7 @@ unsigned int io_seproxyhal_touch_stark_ok(const bagl_element_t *e); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_1_step, +UX_STEP_NOCB(ux_stark_limit_order_1_step, pnn, { &C_icon_eye, @@ -13,42 +13,42 @@ UX_FLOW_DEF_NOCB(ux_stark_limit_order_1_step, "transaction", }); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_2_step, +UX_STEP_NOCB(ux_stark_limit_order_2_step, bnnn_paging, { .title = "Limit", .text = "Order" }); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_3_step, +UX_STEP_NOCB(ux_stark_limit_order_3_step, bnnn_paging, { .title = "Trading", .text = "Pair" }); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_4_step, +UX_STEP_NOCB(ux_stark_limit_order_4_step, bnnn_paging, { .title = "Sell", .text = strings.common.fullAmount }); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_5_step, +UX_STEP_NOCB(ux_stark_limit_order_5_step, bnnn_paging, { .title = "Buy", .text = strings.common.maxFee }); -UX_FLOW_DEF_NOCB(ux_stark_limit_order_6_step, +UX_STEP_NOCB(ux_stark_limit_order_6_step, bnnn_paging, { .title = "Token Accont", .text = strings.common.fullAddress }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_stark_limit_order_7_step, pbb, io_seproxyhal_touch_stark_ok(NULL), @@ -57,7 +57,7 @@ UX_FLOW_DEF_VALID( "Accept", "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_stark_limit_order_8_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -66,7 +66,7 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_stark_limit_order_flow [] = { +UX_FLOW(ux_stark_limit_order_flow, &ux_stark_limit_order_1_step, &ux_stark_limit_order_2_step, &ux_stark_limit_order_3_step, @@ -74,12 +74,11 @@ const ux_flow_step_t * const ux_stark_limit_order_flow [] = { &ux_stark_limit_order_5_step, &ux_stark_limit_order_6_step, &ux_stark_limit_order_7_step, - &ux_stark_limit_order_8_step, - FLOW_END_STEP, -}; + &ux_stark_limit_order_8_step +); ////////////////////////////////////////////////////////////////////// -UX_FLOW_DEF_NOCB(ux_stark_transfer_1_step, +UX_STEP_NOCB(ux_stark_transfer_1_step, pnn, { &C_icon_eye, @@ -87,14 +86,14 @@ UX_FLOW_DEF_NOCB(ux_stark_transfer_1_step, "transaction", }); -UX_FLOW_DEF_NOCB(ux_stark_transfer_2_step, +UX_STEP_NOCB(ux_stark_transfer_2_step, bnnn_paging, { .title = "Transfer", .text = " " }); -UX_FLOW_DEF_NOCB(ux_stark_self_transfer_2_step, +UX_STEP_NOCB(ux_stark_self_transfer_2_step, bnnn_paging, { .title = "Self", @@ -102,28 +101,28 @@ UX_FLOW_DEF_NOCB(ux_stark_self_transfer_2_step, }); -UX_FLOW_DEF_NOCB(ux_stark_transfer_3_step, +UX_STEP_NOCB(ux_stark_transfer_3_step, bnnn_paging, { .title = "Amount", .text = tmpContent.tmp }); -UX_FLOW_DEF_NOCB(ux_stark_transfer_4_step, +UX_STEP_NOCB(ux_stark_transfer_4_step, bnnn_paging, { .title = "Master Account", .text = strings.tmp.tmp }); -UX_FLOW_DEF_NOCB(ux_stark_transfer_5_step, +UX_STEP_NOCB(ux_stark_transfer_5_step, bnnn_paging, { .title = "Token Accont", .text = strings.tmp.tmp2 }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_stark_transfer_6_step, pbb, io_seproxyhal_touch_stark_ok(NULL), @@ -132,7 +131,7 @@ UX_FLOW_DEF_VALID( "Accept", "and send", }); -UX_FLOW_DEF_VALID( +UX_STEP_CB( ux_stark_transfer_7_step, pb, io_seproxyhal_touch_tx_cancel(NULL), @@ -141,25 +140,23 @@ UX_FLOW_DEF_VALID( "Reject", }); -const ux_flow_step_t * const ux_stark_transfer_flow [] = { +UX_FLOW(ux_stark_transfer_flow, &ux_stark_transfer_1_step, &ux_stark_transfer_2_step, &ux_stark_transfer_3_step, &ux_stark_transfer_4_step, &ux_stark_transfer_5_step, &ux_stark_transfer_6_step, - &ux_stark_transfer_7_step, - FLOW_END_STEP, -}; + &ux_stark_transfer_7_step +); -const ux_flow_step_t * const ux_stark_self_transfer_flow [] = { +UX_FLOW(ux_stark_self_transfer_flow, &ux_stark_transfer_1_step, &ux_stark_self_transfer_2_step, &ux_stark_transfer_3_step, &ux_stark_transfer_5_step, &ux_stark_transfer_6_step, - &ux_stark_transfer_7_step, - FLOW_END_STEP, -}; + &ux_stark_transfer_7_step +); #endif