Merge pull request #696 from LedgerHQ/feat/apa/blind_signing_non_zero_amount

Show non-zero amounts in blind-signing flow

Author: apaillier-ledger

src/shared_context.h

@@ -131,6 +131,7 @@ typedef struct txStringProperties_s {
     char maxFee[50];
     char nonce[8];  // 10M tx per account ought to be enough for everybody
     char network_name[NETWORK_STRING_MAX_SIZE + 1];
+    char tx_hash[2 + (INT256_LENGTH * 2) + 1];
 } txStringProperties_t;
 
 #ifdef TARGET_NANOS

src_bagl/ui_flow_signTx.c

@@ -120,7 +120,7 @@ UX_STEP_NOCB(ux_approval_tx_hash_step,
 #else
       .title = "Transaction hash",
 #endif
-      .text = strings.common.fullAmount
+      .text = strings.common.tx_hash
     });
 UX_STEP_NOCB(
     ux_approval_amount_step,
@@ -249,8 +249,8 @@ void ux_approve_tx(bool fromPlugin) {
     } else {
         if (tmpContent.txContent.dataPresent) {
 #pragma GCC diagnostic ignored "-Wformat"
-            snprintf(strings.common.fullAmount,
-                     sizeof(strings.common.fullAmount),
+            snprintf(strings.common.tx_hash,
+                     sizeof(strings.common.tx_hash),
                      "0x%.*h",
                      sizeof(tmpCtx.transactionContext.hash),
                      tmpCtx.transactionContext.hash);
@@ -261,7 +261,8 @@ void ux_approve_tx(bool fromPlugin) {
         if (strings.common.fromAddress[0] != 0) {
             ux_approval_tx_flow[step++] = &ux_approval_from_step;
         }
-        if (!tmpContent.txContent.dataPresent) {
+        if (!tmpContent.txContent.dataPresent ||
+            !allzeroes(tmpContent.txContent.value.value, tmpContent.txContent.value.length)) {
             ux_approval_tx_flow[step++] = &ux_approval_amount_step;
         }
 #ifdef HAVE_TRUSTED_NAME

src_nbgl/ui_approve_tx.c

@@ -122,14 +122,14 @@ static uint8_t setTagValuePairs(void) {
     } else {
         if (tmpContent.txContent.dataPresent) {
 #pragma GCC diagnostic ignored "-Wformat"
-            snprintf(strings.common.fullAmount,
-                     sizeof(strings.common.fullAmount),
+            snprintf(strings.common.tx_hash,
+                     sizeof(strings.common.tx_hash),
                      "0x%.*h",
                      sizeof(tmpCtx.transactionContext.hash),
                      tmpCtx.transactionContext.hash);
 #pragma GCC diagnostic warning "-Wformat"
             pairs[nbPairs].item = "Transaction hash";
-            pairs[nbPairs].value = strings.common.fullAmount;
+            pairs[nbPairs].value = strings.common.tx_hash;
             nbPairs++;
         }
 
@@ -139,7 +139,8 @@ static uint8_t setTagValuePairs(void) {
             nbPairs++;
         }
 
-        if (!tmpContent.txContent.dataPresent) {
+        if (!tmpContent.txContent.dataPresent ||
+            !allzeroes(tmpContent.txContent.value.value, tmpContent.txContent.value.length)) {
             pairs[nbPairs].item = "Amount";
             pairs[nbPairs].value = strings.common.fullAmount;
             nbPairs++;