Merge pull request #189 from Zondax/fix-stax

Zondax · May 17, 2023 · 3de7bc9 · 3de7bc9
2 parents efb1e49 + b03a5fa
commit 3de7bc9
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 5 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=23
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=9420
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1
diff --git a/app/src/secret.c b/app/src/secret.c
@@ -30,11 +30,20 @@ void secret_accept() {
 #endif
 }
 
+#if defined(TARGET_STAX)
+static const char *secret_message =
+        "You are about to enable DOT\n"
+        "recovery mode. Activating this\n"
+        "mode will temporarily allow\n"
+        "you to sign transactions\n"
+        "using Kusama keys.";
+#else
 static const char *secret_message =
         "USE AT YOUR OWN RISK!! "
         "You are about to enable the DOT recovery mode."
         "If you are not sure why you are here, reject or unplug your device immediately."
         "Activating this mode will temporarily allow you to sign transactions using Kusama keys";
+#endif
 
 zxerr_t secret_getNumItems(uint8_t *num_items) {
     zemu_log_stack("secret_getNumItems");
@@ -57,9 +66,17 @@ zxerr_t secret_getItem(int8_t displayIdx,
 
 zxerr_t secret_enabled() {
 #ifdef APP_SECRET_MODE_ENABLED
-    zemu_log("RECOVERY TRIGGERED");
-    view_review_init(secret_getItem, secret_getNumItems, secret_accept);
-    view_review_show(0x00);
+    if (app_mode_secret()) {
+        zemu_log("DISABLE RECOVERY");
+        app_mode_set_secret(false);
+#if !defined(TARGET_STAX)
+        view_idle_show(0, NULL);
+#endif
+    } else {
+        zemu_log("RECOVERY TRIGGERED");
+        view_review_init(secret_getItem, secret_getNumItems, secret_accept);
+        view_review_show(0x00);
+    }
 #endif
     return zxerr_ok;
 }
diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
diff --git a/tests_zemu/snapshots/st-proxy_proxy/00001.png b/tests_zemu/snapshots/st-proxy_proxy/00001.png
diff --git a/tests_zemu/snapshots/st-proxy_proxy/00002.png b/tests_zemu/snapshots/st-proxy_proxy/00002.png
diff --git a/tests_zemu/snapshots/st-proxy_proxy/00003.png b/tests_zemu/snapshots/st-proxy_proxy/00003.png
diff --git a/tests_zemu/snapshots/st-proxy_proxy/00004.png b/tests_zemu/snapshots/st-proxy_proxy/00004.png
diff --git a/tests_zemu/snapshots/st-proxy_proxy/00005.png b/tests_zemu/snapshots/st-proxy_proxy/00005.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00001.png b/tests_zemu/snapshots/st-session_setkeys/00001.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00002.png b/tests_zemu/snapshots/st-session_setkeys/00002.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00003.png b/tests_zemu/snapshots/st-session_setkeys/00003.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00004.png b/tests_zemu/snapshots/st-session_setkeys/00004.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00005.png b/tests_zemu/snapshots/st-session_setkeys/00005.png
diff --git a/tests_zemu/snapshots/st-session_setkeys/00006.png b/tests_zemu/snapshots/st-session_setkeys/00006.png
diff --git a/tests_zemu/snapshots/st-staking_nominate/00001.png b/tests_zemu/snapshots/st-staking_nominate/00001.png
diff --git a/tests_zemu/snapshots/st-staking_nominate/00002.png b/tests_zemu/snapshots/st-staking_nominate/00002.png
diff --git a/tests_zemu/snapshots/st-staking_nominate/00003.png b/tests_zemu/snapshots/st-staking_nominate/00003.png
diff --git a/tests_zemu/snapshots/st-staking_nominate/00004.png b/tests_zemu/snapshots/st-staking_nominate/00004.png
diff --git a/tests_zemu/snapshots/st-staking_nominate/00005.png b/tests_zemu/snapshots/st-staking_nominate/00005.png
diff --git a/tests_zemu/snapshots/st-txUtility_batch/00001.png b/tests_zemu/snapshots/st-txUtility_batch/00001.png
diff --git a/tests_zemu/snapshots/st-txUtility_batch/00002.png b/tests_zemu/snapshots/st-txUtility_batch/00002.png
diff --git a/tests_zemu/snapshots/st-txUtility_batch/00003.png b/tests_zemu/snapshots/st-txUtility_batch/00003.png
diff --git a/tests_zemu/snapshots/st-txUtility_batch/00004.png b/tests_zemu/snapshots/st-txUtility_batch/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
+7 −7		.github/workflows/main.yml
+1 −0		app/ui/view_internal.h
+45 −14		app/ui/view_stax.c
+1 −1		include/zxversion.h