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

2022-09-14 17:27:25 +02:00
parent a27826dcf6 a0d16023d5
commit ab67ae1cb3
61 changed files with 505 additions and 72 deletions
--- a/src_features/setPlugin/cmd_setPlugin.c
+++ b/src_features/setPlugin/cmd_setPlugin.c
@@ -1,10 +1,11 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
-#include "ui_flow.h"
 #include "tokens.h"
 #include "eth_plugin_interface.h"
 #include "eth_plugin_internal.h"
 #include "utils.h"
+#include "common_ui.h"
+#include "os_io_seproxyhal.h"

 // Supported internal plugins
 #define ERC721_STR  "ERC721"