Merge remote-tracking branch 'origin/develop' into HEAD

2022-10-17 11:44:28 +02:00
parent 78c0bfe424 17665478d9
commit 2474bdb81a
75 changed files with 516 additions and 534 deletions
--- a/src_features/getPublicKey/ui_common_getPublicKey.c
+++ b/src_features/getPublicKey/ui_common_getPublicKey.c
@@ -1,6 +1,6 @@
 #include "shared_context.h"
 #include "feature_getPublicKey.h"
-#include "ui_callbacks.h"
+#include "common_ui.h"

 unsigned int io_seproxyhal_touch_address_ok(__attribute__((unused)) const bagl_element_t *e) {
    uint32_t tx = set_result_get_publicKey();