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

Use recommanded UX macros from recents SDKs

Browse Source
This commit is contained in:
TamtamHero
2020-10-20 15:40:31 +02:00
parent 62a144b22b
commit 1f9ef34845
14 changed files with 148 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src_features/signTx/ui_flow_signTx.c
View File

@@ -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,
};
&ux_approval_tx_6_step
);