Merge pull request #96 from Zondax/ui_gas

UI Adjustments
Zondax · Mar 7, 2022 · 263fbd8 · 263fbd8
2 parents 25578dd + 2ec3c46
commit 263fbd8
Show file tree

Hide file tree

Showing 205 changed files with 72 additions and 28 deletions.
diff --git a/app/Makefile b/app/Makefile
@@ -51,8 +51,8 @@ COIN=FIL
 endif
 
 APPVERSION_M=0
-APPVERSION_N=20
-APPVERSION_P=2
+APPVERSION_N=21
+APPVERSION_P=0
 
 $(info COIN  = [$(COIN)])
 ifeq ($(COIN),FIL)

diff --git a/app/src/parser.c b/app/src/parser.c
@@ -36,7 +36,7 @@ parser_error_t parser_parse(parser_context_t *ctx, const uint8_t *data, size_t d
 }
 
 parser_error_t parser_validate(const parser_context_t *ctx) {
-    zemu_log("parser_validate");
+    zemu_log("parser_validate\n");
     CHECK_PARSER_ERR(_validateTx(ctx, &parser_tx_obj))
     zemu_log("parser_validate::validated\n");
 
@@ -121,6 +121,7 @@ parser_error_t parser_getItem(const parser_context_t *ctx,
     char log_tmp[100];
     snprintf(log_tmp, sizeof(log_tmp), "getItem %d\n", displayIdx);
     zemu_log(log_tmp);
+    uint8_t expert_mode = app_mode_expert();
 
     MEMZERO(outKey, outKeyLen);
     MEMZERO(outVal, outValLen);
@@ -149,20 +150,11 @@ parser_error_t parser_getItem(const parser_context_t *ctx,
     }
 
     if (displayIdx == 2) {
-        snprintf(outKey, outKeyLen, "Nonce ");
-        if (uint64_to_str(outVal, outValLen, parser_tx_obj.nonce) != NULL) {
-            return parser_unexepected_error;
-        }
-        *pageCount = 1;
-        return parser_ok;
-    }
-
-    if (displayIdx == 3) {
         snprintf(outKey, outKeyLen, "Value ");
         return parser_printBigIntFixedPoint(&parser_tx_obj.value, outVal, outValLen, pageIdx, pageCount);
     }
 
-    if (displayIdx == 4) {
+    if (displayIdx == 3) {
         snprintf(outKey, outKeyLen, "Gas Limit ");
         if (int64_to_str(outVal, outValLen, parser_tx_obj.gaslimit) != NULL) {
             return parser_unexepected_error;
@@ -171,17 +163,28 @@ parser_error_t parser_getItem(const parser_context_t *ctx,
         return parser_ok;
     }
 
-    if (displayIdx == 5) {
-        snprintf(outKey, outKeyLen, "Gas Premium ");
-        return parser_printBigIntFixedPoint(&parser_tx_obj.gaspremium, outVal, outValLen, pageIdx, pageCount);
-    }
-
-    if (displayIdx == 6) {
+    if (displayIdx == 4) {
         snprintf(outKey, outKeyLen, "Gas Fee Cap ");
         return parser_printBigIntFixedPoint(&parser_tx_obj.gasfeecap, outVal, outValLen, pageIdx, pageCount);
     }
 
-    if (displayIdx == 7) {
+    if (expert_mode){
+        if (displayIdx == 5) {
+            snprintf(outKey, outKeyLen, "Gas Premium ");
+            return parser_printBigIntFixedPoint(&parser_tx_obj.gaspremium, outVal, outValLen, pageIdx, pageCount);
+        }
+
+        if (displayIdx == 6) {
+            snprintf(outKey, outKeyLen, "Nonce ");
+            if (uint64_to_str(outVal, outValLen, parser_tx_obj.nonce) != NULL) {
+                return parser_unexepected_error;
+            }
+            *pageCount = 1;
+            return parser_ok;
+        }
+    }
+
+    if ((displayIdx == 5 && !expert_mode) || (displayIdx == 7 && expert_mode)) {
         snprintf(outKey, outKeyLen, "Method ");
         *pageCount = 1;
 
@@ -205,7 +208,7 @@ parser_error_t parser_getItem(const parser_context_t *ctx,
     }
 
     // remaining display pages show the params
-    int32_t paramIdxSigned = displayIdx - 8;
+    int32_t paramIdxSigned = displayIdx - (numItems - parser_tx_obj.numparams);
 
     // end of params
     if (paramIdxSigned < 0 || paramIdxSigned >= parser_tx_obj.numparams) {

diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
@@ -502,7 +502,11 @@ parser_error_t _validateTx(__Z_UNUSED const parser_context_t *c, __Z_UNUSED cons
 
 uint8_t _getNumItems(__Z_UNUSED const parser_context_t *c, const parser_tx_t *v) {
 
-    uint8_t itemCount = 8;
+    uint8_t itemCount = 6;
+
+    if (app_mode_expert()){
+        itemCount = 8;
+    }
 
     return itemCount + v->numparams;
 }
diff --git a/tests/expected_output.cpp b/tests/expected_output.cpp
@@ -101,15 +101,15 @@ std::vector<std::string> GenerateExpectedUIOutput(const Json::Value &json, bool)
     answer.insert(answer.end(), fromAddress.begin(), fromAddress.end());
 
 
-    addTo(answer, "2 | Nonce : {}", nonce);
+    addTo(answer, "2 | Value : {}", FormatAmount(value));
 
-    addTo(answer, "3 | Value : {}", FormatAmount(value));
+    addTo(answer, "3 | Gas Limit : {}", gaslimit);
 
-    addTo(answer, "4 | Gas Limit : {}", gaslimit);
+    addTo(answer, "4 | Gas Fee Cap : {}", FormatAmount(gasfeecap));
 
     addTo(answer, "5 | Gas Premium : {}", FormatAmount(gaspremium));
 
-    addTo(answer, "6 | Gas Fee Cap : {}", FormatAmount(gasfeecap));
+    addTo(answer, "6 | Nonce : {}", nonce);
 
     switch (method) {
         case 0:

diff --git a/tests_zemu/snapshots/s-mainmenu/00002.png b/tests_zemu/snapshots/s-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00006.png b/tests_zemu/snapshots/s-sign_basic/00006.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00007.png b/tests_zemu/snapshots/s-sign_basic/00007.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00008.png b/tests_zemu/snapshots/s-sign_basic/00008.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00009.png b/tests_zemu/snapshots/s-sign_basic/00009.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00010.png b/tests_zemu/snapshots/s-sign_basic/00010.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00011.png b/tests_zemu/snapshots/s-sign_basic/00011.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00003.png b/tests_zemu/snapshots/s-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00004.png b/tests_zemu/snapshots/s-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00005.png b/tests_zemu/snapshots/s-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00006.png b/tests_zemu/snapshots/s-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00007.png b/tests_zemu/snapshots/s-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00008.png b/tests_zemu/snapshots/s-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00009.png b/tests_zemu/snapshots/s-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00010.png b/tests_zemu/snapshots/s-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00011.png b/tests_zemu/snapshots/s-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00012.png b/tests_zemu/snapshots/s-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/s-sign_proposal/00013.png b/tests_zemu/snapshots/s-sign_proposal/00013.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00000.png b/tests_zemu/snapshots/s-sign_proposal_expert/00000.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00001.png b/tests_zemu/snapshots/s-sign_proposal_expert/00001.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00002.png b/tests_zemu/snapshots/s-sign_proposal_expert/00002.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00003.png b/tests_zemu/snapshots/s-sign_proposal_expert/00003.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00004.png b/tests_zemu/snapshots/s-sign_proposal_expert/00004.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00005.png b/tests_zemu/snapshots/s-sign_proposal_expert/00005.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00006.png b/tests_zemu/snapshots/s-sign_proposal_expert/00006.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00007.png b/tests_zemu/snapshots/s-sign_proposal_expert/00007.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00008.png b/tests_zemu/snapshots/s-sign_proposal_expert/00008.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00009.png b/tests_zemu/snapshots/s-sign_proposal_expert/00009.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00010.png b/tests_zemu/snapshots/s-sign_proposal_expert/00010.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00011.png b/tests_zemu/snapshots/s-sign_proposal_expert/00011.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00012.png b/tests_zemu/snapshots/s-sign_proposal_expert/00012.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/00013.png b/tests_zemu/snapshots/s-sign_proposal_expert/00013.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00012.png → ...napshots/s-sign_proposal_expert/00014.png b/tests_zemu/snapshots/s-sign_basic/00012.png → ...napshots/s-sign_proposal_expert/00014.png
diff --git a/tests_zemu/snapshots/s-sign_basic/00013.png → ...napshots/s-sign_proposal_expert/00015.png b/tests_zemu/snapshots/s-sign_basic/00013.png → ...napshots/s-sign_proposal_expert/00015.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00000.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00000.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00001.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00001.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00002.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00002.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00003.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00004.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00005.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00006.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00007.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00008.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00009.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00010.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00011.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00012.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00013.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00013.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00014.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00014.png
diff --git a/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00015.png b/tests_zemu/snapshots/s-sign_proposal_expert/s-sign_proposal/00015.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00000.png b/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00001.png b/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00002.png b/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00003.png b/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00004.png b/tests_zemu/snapshots/snapshots-tmp/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-show_address/00000.png b/tests_zemu/snapshots/snapshots-tmp/s-show_address/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-show_address/00001.png b/tests_zemu/snapshots/snapshots-tmp/s-show_address/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-show_address/00002.png b/tests_zemu/snapshots/snapshots-tmp/s-show_address/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-show_address/00003.png b/tests_zemu/snapshots/snapshots-tmp/s-show_address/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00000.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00001.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00002.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00003.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00004.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00005.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00006.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00007.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00008.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00009.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00010.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00011.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00012.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00013.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_basic/00013.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00000.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00001.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00002.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00003.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00004.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00005.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00006.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00007.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00008.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00009.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00010.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00011.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00012.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00013.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal/00013.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00000.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00001.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00002.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00003.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00004.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00005.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00006.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00007.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00008.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00009.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00010.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00011.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00012.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00013.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00013.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00014.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00014.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00015.png b/tests_zemu/snapshots/snapshots-tmp/s-sign_proposal_expert/00015.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00012.png → ...pshots/snapshots-tmp/x-mainmenu/00000.png b/tests_zemu/snapshots/x-sign_basic/00012.png → ...pshots/snapshots-tmp/x-mainmenu/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00001.png b/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00002.png b/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00003.png b/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00004.png b/tests_zemu/snapshots/snapshots-tmp/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-show_address/00000.png b/tests_zemu/snapshots/snapshots-tmp/x-show_address/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-show_address/00001.png b/tests_zemu/snapshots/snapshots-tmp/x-show_address/00001.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00011.png → ...ts/snapshots-tmp/x-show_address/00002.png b/tests_zemu/snapshots/x-sign_basic/00011.png → ...ts/snapshots-tmp/x-show_address/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-show_address/00003.png b/tests_zemu/snapshots/snapshots-tmp/x-show_address/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00000.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00001.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00002.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00003.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00004.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00005.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00006.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00007.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00008.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00009.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00010.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00011.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00012.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_basic/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00000.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00001.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00002.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00003.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00004.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00005.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00006.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00007.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00008.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00009.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00010.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00011.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00012.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00000.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00000.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00001.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00001.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00002.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00002.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00003.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00003.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00004.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00004.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00005.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00005.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00006.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00006.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00007.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00007.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00008.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00008.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00009.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00009.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00010.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00010.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00011.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00011.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00012.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00012.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00013.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00013.png
diff --git a/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00014.png b/tests_zemu/snapshots/snapshots-tmp/x-sign_proposal_expert/00014.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00002.png b/tests_zemu/snapshots/x-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00005.png b/tests_zemu/snapshots/x-sign_basic/00005.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00006.png b/tests_zemu/snapshots/x-sign_basic/00006.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00007.png b/tests_zemu/snapshots/x-sign_basic/00007.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00008.png b/tests_zemu/snapshots/x-sign_basic/00008.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00009.png b/tests_zemu/snapshots/x-sign_basic/00009.png
diff --git a/tests_zemu/snapshots/x-sign_basic/00010.png b/tests_zemu/snapshots/x-sign_basic/00010.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00003.png b/tests_zemu/snapshots/x-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00004.png b/tests_zemu/snapshots/x-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00005.png b/tests_zemu/snapshots/x-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00006.png b/tests_zemu/snapshots/x-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00007.png b/tests_zemu/snapshots/x-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00008.png b/tests_zemu/snapshots/x-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00009.png b/tests_zemu/snapshots/x-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00010.png b/tests_zemu/snapshots/x-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00011.png b/tests_zemu/snapshots/x-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/x-sign_proposal/00012.png b/tests_zemu/snapshots/x-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00000.png b/tests_zemu/snapshots/x-sign_proposal_expert/00000.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00001.png b/tests_zemu/snapshots/x-sign_proposal_expert/00001.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00002.png b/tests_zemu/snapshots/x-sign_proposal_expert/00002.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00003.png b/tests_zemu/snapshots/x-sign_proposal_expert/00003.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00004.png b/tests_zemu/snapshots/x-sign_proposal_expert/00004.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00005.png b/tests_zemu/snapshots/x-sign_proposal_expert/00005.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00006.png b/tests_zemu/snapshots/x-sign_proposal_expert/00006.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00007.png b/tests_zemu/snapshots/x-sign_proposal_expert/00007.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00008.png b/tests_zemu/snapshots/x-sign_proposal_expert/00008.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00009.png b/tests_zemu/snapshots/x-sign_proposal_expert/00009.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00010.png b/tests_zemu/snapshots/x-sign_proposal_expert/00010.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00011.png b/tests_zemu/snapshots/x-sign_proposal_expert/00011.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00012.png b/tests_zemu/snapshots/x-sign_proposal_expert/00012.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00013.png b/tests_zemu/snapshots/x-sign_proposal_expert/00013.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/00014.png b/tests_zemu/snapshots/x-sign_proposal_expert/00014.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00000.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00000.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00001.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00001.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00002.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00002.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00003.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00003.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00004.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00004.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00005.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00005.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00006.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00006.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00007.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00007.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00008.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00008.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00009.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00009.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00010.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00010.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00011.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00011.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00012.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00012.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00013.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00013.png
diff --git a/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00014.png b/tests_zemu/snapshots/x-sign_proposal_expert/x-sign_proposal/00014.png
diff --git a/tests_zemu/tests/test.ts b/tests_zemu/tests/test.ts
@@ -158,7 +158,7 @@ describe('Standard', function () {
       // Wait until we are not in the main menu
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
 
-      await sim.compareSnapshotsAndAccept(".", `${m.prefix.toLowerCase()}-sign_basic`, m.name === "nanos" ? 12 : 11);
+      await sim.compareSnapshotsAndAccept(".", `${m.prefix.toLowerCase()}-sign_basic`, m.name === "nanos" ? 10 : 9);
 
       let resp = await signatureRequest;
       console.log(resp);
@@ -207,6 +207,42 @@ describe('Standard', function () {
   });
 
   test.each(models)('sign proposal', async function (m) {
+    const sim = new Zemu(m.path);
+    try {
+      await sim.start({...defaultOptions, model: m.name,});
+      const app = new FilecoinApp(sim.getTransport());
+
+      const path = "m/44'/461'/0'/0/1";
+      const txBlob = Buffer.from(
+        "8a004300ec075501dfe49184d46adc8f89d44638beb45f78fcad259001401a000f4240430009c4430009c402581d845501dfe49184d46adc8f89d44638beb45f78fcad2590430003e80040",
+        "hex",
+      );
+
+      const pkResponse = await app.getAddressAndPubKey(path);
+      console.log(pkResponse);
+      expect(pkResponse.return_code).toEqual(0x9000);
+      expect(pkResponse.error_message).toEqual("No errors");
+      console.log("No errors retriving address")
+
+      // do not wait here so we can get snapshots and interact with the app
+      const signatureRequest = app.sign(path, txBlob);
+
+      // Wait until we are not in the main menu
+      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
+
+      await sim.compareSnapshotsAndAccept(".", `${m.prefix.toLowerCase()}-sign_proposal`, m.name === "nanos" ? 12 : 11);
+
+      let resp = await signatureRequest;
+      console.log(resp);
+
+      expect(resp.return_code).toEqual(0x9000);
+      expect(resp.error_message).toEqual("No errors");
+    } finally {
+      await sim.close();
+    }
+  });
+
+  test.each(models)('sign proposal expert ', async function (m) {
     const sim = new Zemu(m.path);
     try {
       await sim.start({...defaultOptions, model: m.name,});
@@ -234,7 +270,7 @@ describe('Standard', function () {
       // Wait until we are not in the main menu
       await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
 
-      await sim.compareSnapshotsAndAccept(".", `${m.prefix.toLowerCase()}-sign_proposal`, m.name === "nanos" ? 14 : 13);
+      await sim.compareSnapshotsAndAccept(".", `${m.prefix.toLowerCase()}-sign_proposal_expert`, m.name === "nanos" ? 14 : 13);
 
       let resp = await signatureRequest;
       console.log(resp);
@@ -246,6 +282,7 @@ describe('Standard', function () {
     }
   });
 
+
   test.each(models)('sign proposal -- unsupported method', async function (m) {
     const sim = new Zemu(m.path);
     try {