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

src_features/signMessage/cmd_signMessage.c

@@ -2,7 +2,7 @@
 #include "shared_context.h"
 #include "apdu_constants.h"
 #include "utils.h"
-#include "ui_flow.h"
+#include "common_ui.h"
 
 static const char SIGN_MAGIC[] =
     "\x19"
@@ -188,7 +188,7 @@ void handleSignPersonalMessage(uint8_t p1,
 #ifdef NO_CONSENT
         io_seproxyhal_touch_signMessage_ok(NULL);
 #else   // NO_CONSENT
-        ux_flow_init(0, ux_sign_flow, NULL);
+        ui_display_sign();
 #endif  // NO_CONSENT
 
         *flags |= IO_ASYNCH_REPLY;

src_features/signMessage/ui_flow_signMessage.c

@@ -1,44 +0,0 @@
-#include "shared_context.h"
-#include "ui_callbacks.h"
-
-// clang-format off
-UX_STEP_NOCB(
-    ux_sign_flow_1_step,
-    pnn,
-    {
-      &C_icon_certificate,
-      "Sign",
-      "message",
-    });
-UX_STEP_NOCB(
-    ux_sign_flow_2_step,
-    bnnn_paging,
-    {
-      .title = "Message",
-      .text = strings.tmp.tmp,
-    });
-UX_STEP_CB(
-    ux_sign_flow_3_step,
-    pbb,
-    io_seproxyhal_touch_signMessage_ok(NULL),
-    {
-      &C_icon_validate_14,
-      "Sign",
-      "message",
-    });
-UX_STEP_CB(
-    ux_sign_flow_4_step,
-    pbb,
-    io_seproxyhal_touch_signMessage_cancel(NULL),
-    {
-      &C_icon_crossmark,
-      "Cancel",
-      "signature",
-    });
-// clang-format on
-
-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);