Merge pull request #411 from LedgerHQ/xch/fix-standard-app-swap-handling

lib_standard_app: Swap fix and improvment
LedgerHQ · Sep 1, 2023 · e277457 · e277457
2 parents 8b2b9cb + 47532e9
commit e277457
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/lib_standard_app/main.c b/lib_standard_app/main.c
@@ -23,6 +23,10 @@
 
 #ifdef HAVE_SWAP
 #include "swap.h"
+
+#ifdef HAVE_NBGL
+#include "nbgl_use_case.h"
+#endif // HAVE_NBGL
 #endif // HAVE_SWAP
 
 ux_state_t G_ux;
@@ -94,9 +98,6 @@ static void standalone_app_main(void) {
 
 #ifdef HAVE_SWAP
 static void library_app_main(libargs_t *args) {
-    G_called_from_swap = true;
-    G_swap_response_ready = false;
-
     BEGIN_TRY {
         TRY {
             PRINTF("Inside library\n");
@@ -107,12 +108,16 @@ static void library_app_main(libargs_t *args) {
                     // BSS data.
                     bool success = swap_copy_transaction_parameters(args->create_transaction);
                     if (success) {
-                        // BSS was wiped, so init these global again
+                        // BSS was wiped, we can now init these globals
                         G_called_from_swap = true;
                         G_swap_response_ready = false;
 
                         common_app_init();
 
+#ifdef HAVE_NBGL
+                        nbgl_useCaseSpinner("Signing");
+#endif // HAVE_NBGL
+
                         app_main();
                     }
                     break;