From 1b46ccb190a5b0b0d79c5f16718a1788c61070f7 Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Thu, 25 Aug 2022 10:26:48 +0200
Subject: [PATCH] Extract EIP-712 UI code

---
 .../signMessageEIP712 => src_bagl}/ui_flow_712.c          | 0
 .../signMessageEIP712 => src_bagl}/ui_flow_712.h          | 0
 src_features/signMessageEIP712/ui_logic.c                 | 8 ++++----
 src_features/signMessageEIP712/ui_logic.h                 | 4 ++--
 src_features/signMessageEIP712_common/common_712.c        | 6 ++----
 src_features/signMessageEIP712_common/common_712.h        | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)
 rename {src_features/signMessageEIP712 => src_bagl}/ui_flow_712.c (100%)
 rename {src_features/signMessageEIP712 => src_bagl}/ui_flow_712.h (100%)

diff --git a/src_features/signMessageEIP712/ui_flow_712.c b/src_bagl/ui_flow_712.c
similarity index 100%
rename from src_features/signMessageEIP712/ui_flow_712.c
rename to src_bagl/ui_flow_712.c
diff --git a/src_features/signMessageEIP712/ui_flow_712.h b/src_bagl/ui_flow_712.h
similarity index 100%
rename from src_features/signMessageEIP712/ui_flow_712.h
rename to src_bagl/ui_flow_712.h
diff --git a/src_features/signMessageEIP712/ui_logic.c b/src_features/signMessageEIP712/ui_logic.c
index 0099936..3c6635a 100644
--- a/src_features/signMessageEIP712/ui_logic.c
+++ b/src_features/signMessageEIP712/ui_logic.c
@@ -451,8 +451,8 @@ void ui_712_deinit(void) {
  * @param[in] e unused here, just needed to match the UI function signature
  * @return unused here, just needed to match the UI function signature
  */
-unsigned int ui_712_approve(const bagl_element_t *e) {
-    ui_712_approve_cb(e);
+unsigned int ui_712_approve() {
+    ui_712_approve_cb();
     eip712_context_deinit();
     return 0;
 }
@@ -464,8 +464,8 @@ unsigned int ui_712_approve(const bagl_element_t *e) {
  * @param[in] e unused here, just needed to match the UI function signature
  * @return unused here, just needed to match the UI function signature
  */
-unsigned int ui_712_reject(const bagl_element_t *e) {
-    ui_712_reject_cb(e);
+unsigned int ui_712_reject() {
+    ui_712_reject_cb();
     eip712_context_deinit();
     return 0;
 }
diff --git a/src_features/signMessageEIP712/ui_logic.h b/src_features/signMessageEIP712/ui_logic.h
index 47a2b7e..72224b0 100644
--- a/src_features/signMessageEIP712/ui_logic.h
+++ b/src_features/signMessageEIP712/ui_logic.h
@@ -29,8 +29,8 @@ void ui_712_next_field(void);
 void ui_712_review_struct(const void *const struct_ptr);
 bool ui_712_new_field(const void *const field_ptr, const uint8_t *const data, uint8_t length);
 void ui_712_end_sign(void);
-unsigned int ui_712_approve(const bagl_element_t *e);
-unsigned int ui_712_reject(const bagl_element_t *e);
+unsigned int ui_712_approve();
+unsigned int ui_712_reject();
 void ui_712_set_title(const char *const str, uint8_t length);
 void ui_712_set_value(const char *const str, uint8_t length);
 void ui_712_message_hash(void);
diff --git a/src_features/signMessageEIP712_common/common_712.c b/src_features/signMessageEIP712_common/common_712.c
index 27b345f..4bed719 100644
--- a/src_features/signMessageEIP712_common/common_712.c
+++ b/src_features/signMessageEIP712_common/common_712.c
@@ -5,14 +5,13 @@
 
 static const uint8_t EIP_712_MAGIC[] = {0x19, 0x01};
 
-unsigned int ui_712_approve_cb(const bagl_element_t *e) {
+unsigned int ui_712_approve_cb() {
     uint8_t privateKeyData[INT256_LENGTH];
     uint8_t hash[INT256_LENGTH];
     uint8_t signature[100];
     cx_ecfp_private_key_t privateKey;
     uint32_t tx = 0;
 
-    (void) e;
     io_seproxyhal_io_heartbeat();
     cx_keccak_init(&global_sha3, 256);
     cx_hash((cx_hash_t *) &global_sha3,
@@ -74,8 +73,7 @@ unsigned int ui_712_approve_cb(const bagl_element_t *e) {
     return 0;  // do not redraw the widget
 }
 
-unsigned int ui_712_reject_cb(const bagl_element_t *e) {
-    (void) e;
+unsigned int ui_712_reject_cb() {
     reset_app_context();
     G_io_apdu_buffer[0] = 0x69;
     G_io_apdu_buffer[1] = 0x85;
diff --git a/src_features/signMessageEIP712_common/common_712.h b/src_features/signMessageEIP712_common/common_712.h
index 9c279d1..1283a61 100644
--- a/src_features/signMessageEIP712_common/common_712.h
+++ b/src_features/signMessageEIP712_common/common_712.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include "ux.h"
 
-unsigned int ui_712_approve_cb(const bagl_element_t *e);
-unsigned int ui_712_reject_cb(const bagl_element_t *e);
+unsigned int ui_712_approve_cb();
+unsigned int ui_712_reject_cb();
 
 #endif  // COMMON_EIP712_H_