From 18889d667bf0df09874d952a1de6da008b2a861b Mon Sep 17 00:00:00 2001
From: Charles-Edouard de la Vergne <charles-edouard.delavergne@ledger.fr>
Date: Tue, 18 Jun 2024 11:57:00 +0200
Subject: [PATCH] Change fields order presentation

---
 src_bagl/ui_domain_name.c |  2 +-
 src_bagl/ui_flow_signTx.c | 19 +++++++------------
 src_nbgl/ui_approve_tx.c  | 18 +++++++++---------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src_bagl/ui_domain_name.c b/src_bagl/ui_domain_name.c
index 3121546..3807a61 100644
--- a/src_bagl/ui_domain_name.c
+++ b/src_bagl/ui_domain_name.c
@@ -9,7 +9,7 @@ UX_STEP_NOCB(
     ux_domain_name_step,
     bnnn_paging,
     {
-      .title = "Domain",
+      .title = "To (domain)",
       .text = g_domain_name
     });
 // clang-format on
diff --git a/src_bagl/ui_flow_signTx.c b/src_bagl/ui_flow_signTx.c
index 7725c84..1b9d0f3 100644
--- a/src_bagl/ui_flow_signTx.c
+++ b/src_bagl/ui_flow_signTx.c
@@ -117,7 +117,7 @@ UX_STEP_NOCB(
       .text = strings.common.fromAddress,
     });
 UX_STEP_NOCB(
-    ux_approval_address_step,
+    ux_approval_to_step,
     bnnn_paging,
     {
       .title = "To",
@@ -226,28 +226,24 @@ void ux_approve_tx(bool fromPlugin) {
         ux_approval_tx_flow[step++] = &ux_plugin_approval_after_step;
     } else {
         // We're in a regular transaction, just show the amount and the address
+        if (strings.common.fromAddress[0] != 0) {
+            ux_approval_tx_flow[step++] = &ux_approval_from_step;
+        }
         ux_approval_tx_flow[step++] = &ux_approval_amount_step;
 #ifdef HAVE_DOMAIN_NAME
         uint64_t chain_id = get_tx_chain_id();
         if (has_domain_name(&chain_id, tmpContent.txContent.destination)) {
             ux_approval_tx_flow[step++] = &ux_domain_name_step;
-            if (N_storage.verbose_domain_name) {
-                if (strings.common.fromAddress[0] != 0) {
-                    ux_approval_tx_flow[step++] = &ux_approval_from_step;
-                }
-                ux_approval_tx_flow[step++] = &ux_approval_address_step;
-            }
         } else {
 #endif  // HAVE_DOMAIN_NAME
-            if (strings.common.fromAddress[0] != 0) {
-                ux_approval_tx_flow[step++] = &ux_approval_from_step;
-            }
-            ux_approval_tx_flow[step++] = &ux_approval_address_step;
+            ux_approval_tx_flow[step++] = &ux_approval_to_step;
 #ifdef HAVE_DOMAIN_NAME
         }
 #endif  // HAVE_DOMAIN_NAME
     }
 
+    ux_approval_tx_flow[step++] = &ux_approval_fees_step;
+
     if (N_storage.displayNonce) {
         ux_approval_tx_flow[step++] = &ux_approval_nonce_step;
     }
@@ -257,7 +253,6 @@ void ux_approve_tx(bool fromPlugin) {
         ux_approval_tx_flow[step++] = &ux_approval_network_step;
     }
 
-    ux_approval_tx_flow[step++] = &ux_approval_fees_step;
     ux_approval_tx_flow[step++] = &ux_approval_accept_step;
     ux_approval_tx_flow[step++] = &ux_approval_reject_step;
     ux_approval_tx_flow[step++] = FLOW_END_STEP;
diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index 7aed4d1..cae195f 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -116,22 +116,22 @@ static uint8_t setTagValuePairs(void) {
         pairs[nbPairs].value = strings.common.maxFee;
         nbPairs++;
     } else {
-        pairs[nbPairs].item = "Amount";
-        pairs[nbPairs].value = strings.common.fullAmount;
-        nbPairs++;
-
         if (strings.common.fromAddress[0] != 0) {
             pairs[nbPairs].item = "From";
             pairs[nbPairs].value = strings.common.fromAddress;
             nbPairs++;
         }
 
+        pairs[nbPairs].item = "Amount";
+        pairs[nbPairs].value = strings.common.fullAmount;
+        nbPairs++;
+
 #ifdef HAVE_DOMAIN_NAME
         uint64_t chain_id = get_tx_chain_id();
         tx_approval_context.domain_name_match =
             has_domain_name(&chain_id, tmpContent.txContent.destination);
         if (tx_approval_context.domain_name_match) {
-            pairs[nbPairs].item = "Domain";
+            pairs[nbPairs].item = "To (domain)";
             pairs[nbPairs].value = g_domain_name;
             nbPairs++;
         }
@@ -143,15 +143,15 @@ static uint8_t setTagValuePairs(void) {
 #ifdef HAVE_DOMAIN_NAME
         }
 #endif
+        pairs[nbPairs].item = "Max fees";
+        pairs[nbPairs].value = strings.common.maxFee;
+        nbPairs++;
+
         if (N_storage.displayNonce) {
             pairs[nbPairs].item = "Nonce";
             pairs[nbPairs].value = strings.common.nonce;
             nbPairs++;
         }
-        pairs[nbPairs].item = "Max fees";
-        pairs[nbPairs].value = strings.common.maxFee;
-        nbPairs++;
-
         if (tx_approval_context.displayNetwork) {
             pairs[nbPairs].item = "Network";
             pairs[nbPairs].value = strings.common.network_name;