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

Add manual ux_flow; display nonce is now a setting

Browse Source
This commit is contained in:
pscott
2021-02-05 17:52:46 +01:00
parent b2d5b85a2f
commit 2518efd3dd
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui_flow.h
View File

@@ -12,10 +12,6 @@ extern const ux_flow_step_t* const ux_confirm_selector_flow[];
extern const ux_flow_step_t* const ux_confirm_parameter_flow[]; extern const ux_flow_step_t* const ux_confirm_parameter_flow[];
extern const ux_flow_step_t* const ux_approval_tx_flow[];
extern const ux_flow_step_t* const ux_approval_tx_data_warning_flow[];
extern const ux_flow_step_t* const ux_approval_allowance_flow[]; extern const ux_flow_step_t* const ux_approval_allowance_flow[];
extern const ux_flow_step_t* const ux_sign_flow[]; extern const ux_flow_step_t* const ux_sign_flow[];

6
src_features/signTx/logic_signTx.c
View File

@@ -380,11 +380,7 @@ void finalizeParsing(bool direct) {
io_seproxyhal_touch_tx_ok(NULL); io_seproxyhal_touch_tx_ok(NULL);
} else { } else {
if (genericUI) { if (genericUI) {
ux_flow_init( ux_approve_tx(dataPresent);
0,
((dataPresent && !N_storage.contractDetails) ? ux_approval_tx_data_warning_flow
: ux_approval_tx_flow),
NULL);
} else { } else {
plugin_ui_start(); plugin_ui_start();
} }

36
src_features/signTx/ui_flow_signTx.c
View File

@@ -148,21 +148,23 @@ UX_STEP_NOCB(ux_approval_tx_data_warning_step,
}); });
// clang-format on // clang-format on
UX_FLOW(ux_approval_tx_flow, const ux_flow_step_t *ux_approval_tx_flow_scott[9];
&ux_approval_tx_1_step,
&ux_approval_tx_2_step,
&ux_approval_tx_3_step,
&ux_approval_tx_display_nonce_step,
&ux_approval_tx_4_step,
&ux_approval_tx_5_step,
&ux_approval_tx_6_step);
UX_FLOW(ux_approval_tx_data_warning_flow, void ux_approve_tx(bool dataPresent) {
&ux_approval_tx_1_step, int step = 0;
&ux_approval_tx_data_warning_step, ux_approval_tx_flow_scott[step++] = &ux_approval_tx_1_step;
&ux_approval_tx_2_step, if (dataPresent && !N_storage.contractDetails) {
&ux_approval_tx_3_step, ux_approval_tx_flow_scott[step++] = &ux_approval_tx_data_warning_step;
&ux_approval_tx_display_nonce_step, }
&ux_approval_tx_4_step, ux_approval_tx_flow_scott[step++] = &ux_approval_tx_2_step;
&ux_approval_tx_5_step, ux_approval_tx_flow_scott[step++] = &ux_approval_tx_3_step;
&ux_approval_tx_6_step); if (N_storage.displayNonce) {
ux_approval_tx_flow_scott[step++] = &ux_approval_tx_display_nonce_step;
}
ux_approval_tx_flow_scott[step++] = &ux_approval_tx_4_step;
ux_approval_tx_flow_scott[step++] = &ux_approval_tx_5_step;
ux_approval_tx_flow_scott[step++] = &ux_approval_tx_6_step;
ux_approval_tx_flow_scott[step++] = FLOW_END_STEP;
ux_flow_init(0, ux_approval_tx_flow_scott, NULL);
}