feat: improve keys data review for better user experience (#121)

* feat: update snapshots

* feat: improve keys data review for better user experience

* feat: update snapshots

Author: emmanuelm41

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the major version
 APPVERSION_M=4
 # This is the minor version
-APPVERSION_N=1
+APPVERSION_N=2
 # This is the patch version
-APPVERSION_P=4
+APPVERSION_P=0

app/src/common/actions.c

@@ -20,3 +20,4 @@
 
 address_state_t action_addrResponse;
 key_state_t key_state;
+bool keys_permission_granted = false;

app/src/common/actions.h

@@ -31,6 +31,7 @@
 
 extern address_state_t action_addrResponse;
 extern key_state_t key_state;
+extern bool keys_permission_granted;
 
 __Z_INLINE void app_reject() {
     transaction_reset();
@@ -41,6 +42,7 @@ __Z_INLINE void app_reject() {
 }
 
 __Z_INLINE void app_reply_key() {
+    keys_permission_granted = true;
     set_code(G_io_apdu_buffer, key_state.len, APDU_CODE_OK);
     io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, key_state.len + 2);
 }

app/src/handlers/handler_keys.h

@@ -34,6 +34,8 @@
 #include "view_internal.h"
 #include "zxmacros.h"
 
+
+
 // Transmitted notes are stored on the blockchain in encrypted form.
 // If the note was sent to Alice, she uses her incoming viewing key (IVK)
 // to decrypt the note (so that she can subsequently send it).
@@ -61,9 +63,15 @@ __Z_INLINE void handleGetKeyIVK(volatile uint32_t *flags, volatile uint32_t *tx,
     }
     key_state.len = (uint8_t)replyLen;
 
-    view_review_init(key_getItem, key_getNumItems, app_reply_key);
-    view_review_show(REVIEW_GENERIC);
-    *flags |= IO_ASYNCH_REPLY;
+    if (app_mode_expert() || !keys_permission_granted) {
+        view_review_init(key_getItem, key_getNumItems, app_reply_key);
+        view_review_show(REVIEW_GENERIC);
+        *flags |= IO_ASYNCH_REPLY;
+        return;
+    }
+
+    *tx = replyLen;
+    THROW(APDU_CODE_OK);
 }
 
 // If Bob sends a note to Alice (stored on the blockchain in encrypted form),
@@ -89,9 +97,14 @@ __Z_INLINE void handleGetKeyOVK(volatile uint32_t *flags, volatile uint32_t *tx,
     }
     key_state.len = (uint8_t)replyLen;
 
-    view_review_init(key_getItem, key_getNumItems, app_reply_key);
-    view_review_show(REVIEW_GENERIC);
-    *flags |= IO_ASYNCH_REPLY;
+    if (app_mode_expert() || !keys_permission_granted) {
+        view_review_init(key_getItem, key_getNumItems, app_reply_key);
+        view_review_show(REVIEW_GENERIC);
+        *flags |= IO_ASYNCH_REPLY;
+    }
+
+    *tx = replyLen;
+    THROW(APDU_CODE_OK);
 }
 
 // Get the sapling full viewing key (ak, nk, ovk)
@@ -119,9 +132,14 @@ __Z_INLINE void handleGetKeyFVK(volatile uint32_t *flags, volatile uint32_t *tx,
     }
     key_state.len = (uint8_t)replyLen;
 
-    view_review_init(key_getItem, key_getNumItems, app_reply_key);
-    view_review_show(REVIEW_GENERIC);
-    *flags |= IO_ASYNCH_REPLY;
+    if (app_mode_expert() || !keys_permission_granted) {
+        view_review_init(key_getItem, key_getNumItems, app_reply_key);
+        view_review_show(REVIEW_GENERIC);
+        *flags |= IO_ASYNCH_REPLY;
+    }
+
+    *tx = replyLen;
+    THROW(APDU_CODE_OK);
 }
 
 // Computing the note nullifier nf is required in order to spend the note.
@@ -164,9 +182,14 @@ __Z_INLINE void handleGetNullifier(volatile uint32_t *flags, volatile uint32_t *
     }
     key_state.len = (uint8_t)replyLen;
 
-    view_review_init(key_getItem, key_getNumItems, app_reply_key);
-    view_review_show(REVIEW_GENERIC);
-    *flags |= IO_ASYNCH_REPLY;
+    if (app_mode_expert() || !keys_permission_granted) {
+        view_review_init(key_getItem, key_getNumItems, app_reply_key);
+        view_review_show(REVIEW_GENERIC);
+        *flags |= IO_ASYNCH_REPLY;
+    }
+
+    *tx = replyLen;
+    THROW(APDU_CODE_OK);
 }
 
 __Z_INLINE void handleGetDiversifierList(volatile uint32_t *tx, uint32_t rx) {

app/src/key.c

@@ -49,36 +49,51 @@ zxerr_t key_getItem(int8_t displayIdx,
     }
 
     zemu_log_stack("key_getItem");
-    char tmpBuffer[200];
+    char tmpBuffer[200] = "";
 
     switch (displayIdx) {
         case 0: {
             zemu_log_stack("case 0");
             MEMZERO(tmpBuffer, sizeof(tmpBuffer));
-            switch (key_state.kind) {
-                case key_ovk:
-                    snprintf(outKey, outKeyLen, "Send OVK?");
-                    array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
-                    pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
-                    return zxerr_ok;
-                case key_ivk:
-                    snprintf(outKey, outKeyLen, "Send IVK?");
-                    array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
-                    pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
-                    return zxerr_ok;
-                case key_fvk:
-                    snprintf(outKey, outKeyLen, "Send FVK?\n");
-                    array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
-                    pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
-                    return zxerr_ok;
-                case nf:
-                    zemu_log_stack("Send NF?");
-                    snprintf(outKey, outKeyLen, "Send NF?");
-                    array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
-                    pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
-                    return zxerr_ok;
-                default:
-                    return zxerr_unknown;
+
+            if (app_mode_expert()) {
+                switch (key_state.kind) {
+                    case key_ovk:
+                        snprintf(outKey, outKeyLen, "Send OVK?");
+                        array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
+                        pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
+                        return zxerr_ok;
+                    case key_ivk:
+                        snprintf(outKey, outKeyLen, "Send IVK?");
+                        array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
+                        pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
+                        return zxerr_ok;
+                    case key_fvk:
+                        snprintf(outKey, outKeyLen, "Send FVK?\n");
+                        array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
+                        pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
+                        return zxerr_ok;
+                    case nf:
+                        zemu_log_stack("Send NF?");
+                        snprintf(outKey, outKeyLen, "Send NF?");
+                        array_to_hexstr(tmpBuffer, sizeof(tmpBuffer), G_io_apdu_buffer, 32);
+                        pageString(outVal, outValLen, tmpBuffer, pageIdx, pageCount);
+                        return zxerr_ok;
+                    default:
+                        return zxerr_unknown;
+                }
+            } else {
+                switch (key_state.kind) {
+                    case key_ovk:
+                    case key_ivk:
+                    case key_fvk:
+                    case nf:
+                        snprintf(outKey, outKeyLen, "Retrieve data?");
+                        snprintf(outVal, outValLen, "IVKs, OVKs, FVKs or NFs");
+                        return zxerr_ok;
+                    default:
+                        return zxerr_unknown;
+                }
             }
         }
         case 1: {