From ddc70a7bf29a0f67b7488092bf637250f73dae8c Mon Sep 17 00:00:00 2001
From: Charles-Edouard de la Vergne <charles-edouard.delavergne@ledger.fr>
Date: Wed, 26 Jun 2024 17:09:06 +0200
Subject: [PATCH] Moved 'genericReview' to 'Normal' for display_privacy

---
 src_nbgl/ui_display_privacy.c | 68 ++++++++++-------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/src_nbgl/ui_display_privacy.c b/src_nbgl/ui_display_privacy.c
index 59ff20c..65b5363 100644
--- a/src_nbgl/ui_display_privacy.c
+++ b/src_nbgl/ui_display_privacy.c
@@ -4,64 +4,32 @@
 #include "nbgl_use_case.h"
 #include "nbgl_content.h"
 
-enum {
-    TOKEN_APPROVE = FIRST_USER_TOKEN,
-};
-
-static void reviewReject(void) {
-    io_seproxyhal_touch_privacy_cancel(NULL);
-}
-
-static void long_press_cb(int token, uint8_t index, int page) {
-    UNUSED(index);
-    UNUSED(page);
-    if (token == TOKEN_APPROVE) {
+static void reviewChoice(bool confirm) {
+    if (confirm) {
         io_seproxyhal_touch_privacy_ok(NULL);
+    } else {
+        io_seproxyhal_touch_privacy_cancel(NULL);
     }
 }
 
 static void buildFirstPage(const char *review_string) {
-    static nbgl_genericContents_t contents = {0};
-    static nbgl_content_t contentsList[3] = {0};
     static nbgl_contentTagValue_t pairs[2] = {0};
-    uint8_t nbContents = 0;
-    uint8_t nbPairs = 0;
+    static nbgl_contentTagValueList_t pairsList = {0};
 
-    pairs[nbPairs].item = "Address";
-    pairs[nbPairs].value = strings.common.toAddress;
-    nbPairs++;
-    pairs[nbPairs].item = "Key";
-    pairs[nbPairs].value = strings.common.fullAmount;
-    nbPairs++;
+    pairs[0].item = "Address";
+    pairs[0].value = strings.common.toAddress;
+    pairs[1].item = "Key";
+    pairs[1].value = strings.common.fullAmount;
+    pairsList.nbPairs = 2;
+    pairsList.pairs = pairs;
 
-    // Title page
-    contentsList[nbContents].type = CENTERED_INFO;
-    contentsList[nbContents].content.centeredInfo.text1 = review_string;
-    contentsList[nbContents].content.centeredInfo.icon = get_app_icon(true);
-    contentsList[nbContents].content.centeredInfo.style = LARGE_CASE_INFO;
-    nbContents++;
-
-    // Values to be reviewed
-    contentsList[nbContents].type = TAG_VALUE_LIST;
-    contentsList[nbContents].content.tagValueList.pairs = pairs;
-    contentsList[nbContents].content.tagValueList.nbPairs = nbPairs;
-    nbContents++;
-
-    // Approval screen
-    contentsList[nbContents].type = INFO_LONG_PRESS;
-    contentsList[nbContents].content.infoLongPress.text = review_string;
-    contentsList[nbContents].content.infoLongPress.icon = get_app_icon(true);
-    contentsList[nbContents].content.infoLongPress.longPressText = "Hold to approve";
-    contentsList[nbContents].content.infoLongPress.longPressToken = TOKEN_APPROVE;
-    contentsList[nbContents].content.infoLongPress.tuneId = NB_TUNES;
-    contentsList[nbContents].contentActionCallback = long_press_cb;
-    nbContents++;
-
-    contents.callbackCallNeeded = false;
-    contents.contentsList = contentsList;
-    contents.nbContents = nbContents;
-
-    nbgl_useCaseGenericReview(&contents, REJECT_BUTTON, reviewReject);
+    nbgl_useCaseReview(TYPE_OPERATION,
+                       &pairsList,
+                       get_tx_icon(),
+                       review_string,
+                       NULL,
+                       review_string,
+                       reviewChoice);
 }
 
 void ui_display_privacy_public_key(void) {