Rework review label for Stax and Flex (#33)

* fix: remove custom review labels for stax and flex * fix: remove useless gitmodules * chore: bump zxlib version to latest * chore: bump app version and snapshots * fix: last zemu test
Zondax · Aug 9, 2024 · 191ca98 · 191ca98
1 parent 9444121
commit 191ca98
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 26 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,24 +1,9 @@
-[submodule "deps/nanos-secure-sdk"]
-	path = deps/nanos-secure-sdk
-	url = https://github.com/LedgerHQ/nanos-secure-sdk
-[submodule "deps/nanosplus-secure-sdk"]
-	path = deps/nanosplus-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
-[submodule "deps/nanox-secure-sdk"]
-	path = deps/nanox-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
-[submodule "cmake/cmake-modules"]
-	path = cmake/cmake-modules
-	url = https://github.com/bilke/cmake-modules
 [submodule "deps/picohash"]
 	path = deps/picohash
 	url = https://github.com/kazuho/picohash
 [submodule "deps/ledger-zxlib"]
 	path = deps/ledger-zxlib
 	url = https://github.com/Zondax/ledger-zxlib.git
-[submodule "deps/stax-secure-sdk"]
-	path = deps/stax-secure-sdk
-	url = https://github.com/LedgerHQ/ledger-secure-sdk.git
 [submodule "deps/ledger-secure-sdk"]
 	path = deps/ledger-secure-sdk
 	url = https://github.com/LedgerHQ/ledger-secure-sdk
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=1
 # This is the patch version of this release
-APPVERSION_P=13
+APPVERSION_P=14
diff --git a/app/src/common/parser.h b/app/src/common/parser.h
@@ -46,8 +46,6 @@ parser_error_t parser_getItem(parser_context_t *ctx,
 
 parser_error_t getItem(uint8_t index, uint8_t* displayIdx);
 
-parser_error_t parser_getTxnText(parser_context_t *ctx, char *outVal, uint16_t outValLen);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/app/src/common/tx.c b/app/src/common/tx.c
@@ -122,13 +122,6 @@ zxerr_t tx_getItem(int8_t displayIdx,
 {
     uint8_t numItems = 0;
 
-#if defined(TARGET_STAX) || defined(TARGET_FLEX)
-    if (displayIdx == -1) {
-        const parser_error_t tmpError = parser_getTxnText(&ctx_parsed_tx, outVal, outValLen);
-        return (tmpError == parser_ok ? zxerr_ok : zxerr_no_data);
-    }
-#endif
-
     CHECK_ZXERR(tx_getNumItems(&numItems))
 
     if (displayIdx > numItems) {

diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application/00000.png b/tests_zemu/snapshots/fl-sign_application/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_big/00000.png b/tests_zemu/snapshots/fl-sign_application_big/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_asset_config/00000.png b/tests_zemu/snapshots/fl-sign_asset_config/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png b/tests_zemu/snapshots/fl-sign_asset_freeze/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png b/tests_zemu/snapshots/fl-sign_asset_transfer/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_keyreg/00000.png b/tests_zemu/snapshots/fl-sign_keyreg/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_payment/00000.png b/tests_zemu/snapshots/fl-sign_payment/00000.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00005.png b/tests_zemu/snapshots/sp-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00011.png b/tests_zemu/snapshots/sp-mainmenu/00011.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application/00000.png b/tests_zemu/snapshots/st-sign_application/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application/00002.png b/tests_zemu/snapshots/st-sign_application/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00000.png b/tests_zemu/snapshots/st-sign_application_big/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_big/00002.png b/tests_zemu/snapshots/st-sign_application_big/00002.png
diff --git a/tests_zemu/snapshots/st-sign_asset_config/00000.png b/tests_zemu/snapshots/st-sign_asset_config/00000.png
diff --git a/tests_zemu/snapshots/st-sign_asset_freeze/00000.png b/tests_zemu/snapshots/st-sign_asset_freeze/00000.png
diff --git a/tests_zemu/snapshots/st-sign_asset_transfer/00000.png b/tests_zemu/snapshots/st-sign_asset_transfer/00000.png
diff --git a/tests_zemu/snapshots/st-sign_keyreg/00000.png b/tests_zemu/snapshots/st-sign_keyreg/00000.png
diff --git a/tests_zemu/snapshots/st-sign_payment/00000.png b/tests_zemu/snapshots/st-sign_payment/00000.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00005.png b/tests_zemu/snapshots/x-mainmenu/00005.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
+5 −1		app/ui/view.c
+31 −31		app/ui/view.h
+10 −1		app/ui/view_internal.h
+1 −0		app/ui/view_nano.c
+38 −1		app/ui/view_nbgl.c
+3 −1		app/ui/view_s.c
+4 −1		app/ui/view_x.c
+1 −1		include/zxversion.h