From f43d9c4dc74dab4ea8ced7ab1c1d5b0e3a86330c Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Thu, 6 Oct 2022 14:55:13 +0200
Subject: [PATCH] Fix EIP-191 UI split

---
 src/common_ui.h                            |  9 ++++++++-
 src_bagl/ui_flow_signMessage.c             |  4 +++-
 src_bagl/ui_flow_signMessage.h             | 12 ------------
 src_features/signMessage/cmd_signMessage.c |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 src_bagl/ui_flow_signMessage.h

diff --git a/src/common_ui.h b/src/common_ui.h
index 9b65600..3bca6b9 100644
--- a/src/common_ui.h
+++ b/src/common_ui.h
@@ -18,7 +18,14 @@ void ui_stark_limit_order(void);
 void ui_stark_unsafe_sign(void);
 void ui_stark_transfer(bool selfTransfer, bool conditional);
 
+// EIP-191
+void ui_191_start(void);
+void ui_191_switch_to_message(void);
+void ui_191_switch_to_message_end(void);
+void ui_191_switch_to_sign(void);
+void ui_191_switch_to_question(void);
+
 #include "ui_callbacks.h"
 #include <string.h>
 
-#endif  // _COMMON_UI_H_
\ No newline at end of file
+#endif  // _COMMON_UI_H_
diff --git a/src_bagl/ui_flow_signMessage.c b/src_bagl/ui_flow_signMessage.c
index 545c221..9b97d57 100644
--- a/src_bagl/ui_flow_signMessage.c
+++ b/src_bagl/ui_flow_signMessage.c
@@ -1,8 +1,10 @@
 #include "shared_context.h"
 #include "ui_callbacks.h"
-#include "ui_flow_signMessage.h"
+#include "common_ui.h"
 #include "sign_message.h"
 
+typedef enum { UI_191_POS_REVIEW, UI_191_POS_QUESTION, UI_191_POS_END } e_ui_191_position;
+
 static uint8_t ui_pos;
 
 static void dummy_pre_cb(void) {
diff --git a/src_bagl/ui_flow_signMessage.h b/src_bagl/ui_flow_signMessage.h
deleted file mode 100644
index 69e047b..0000000
--- a/src_bagl/ui_flow_signMessage.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef UI_FLOW_SIGNMESSAGE_H_
-#define UI_FLOW_SIGNMESSAGE_H_
-
-typedef enum { UI_191_POS_REVIEW, UI_191_POS_QUESTION, UI_191_POS_END } e_ui_191_position;
-
-void ui_191_start(void);
-void ui_191_switch_to_message(void);
-void ui_191_switch_to_message_end(void);
-void ui_191_switch_to_sign(void);
-void ui_191_switch_to_question(void);
-
-#endif  // UI_FLOW_SIGNMESSAGE_H_
diff --git a/src_features/signMessage/cmd_signMessage.c b/src_features/signMessage/cmd_signMessage.c
index 1c764b1..9cfd4d6 100644
--- a/src_features/signMessage/cmd_signMessage.c
+++ b/src_features/signMessage/cmd_signMessage.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "apdu_constants.h"
 #include "sign_message.h"
-#include "ui_flow_signMessage.h"
+#include "common_ui.h"
 
 static uint8_t processed_size;
 static struct {