Merge pull request #381 from LedgerHQ/abo_update_api_level_12

Update API LEVEL 12
LedgerHQ · Jul 20, 2023 · d88fb52 · d88fb52
2 parents 18a48dc + 806078d
commit d88fb52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib_nbgl/src/nbgl_use_case.c b/lib_nbgl/src/nbgl_use_case.c
@@ -598,7 +598,7 @@ static void displaySkipWarning(void) {
   nbgl_pageConfirmationDescription_t info = {
     .cancelText = "Go back to review",
     .centeredInfo.text1 = "Skip message review?",
-    .centeredInfo.text2 = "You can skip directly to signing\nif you're sure you don't need to\nreview all the fields.",
+    .centeredInfo.text2 = "Skip only if you trust the\nsource. If you skip, you won't\nbe able to review it again.",
     .centeredInfo.text3 = NULL,
     .centeredInfo.style = LARGE_CASE_INFO,
     .centeredInfo.icon = &C_warning64px,

diff --git a/src/os_io_seproxyhal.c b/src/os_io_seproxyhal.c
@@ -1414,7 +1414,13 @@ unsigned short io_exchange(unsigned char channel, unsigned short tx_len) {
 
       // An apdu has been received asynchronously.
       if (G_io_app.apdu_state != APDU_IDLE && G_io_app.apdu_length > 0) {
+#ifdef HAVE_BOLOS
+        // for Bolos UX, answer SWO_SEC_PIN_15 as soon as PIN has been set and PIN is not validated
         if (os_perso_is_pin_set() == BOLOS_TRUE && os_global_pin_is_validated() != BOLOS_TRUE) {
+#else // ! HAVE_BOLOS
+        // for Apps, answer SWO_SEC_PIN_15 as soon as device is onboarded and PIN is not validated
+        if (os_perso_isonboarded() == BOLOS_TRUE && os_global_pin_is_validated() != BOLOS_TRUE) {
+#endif // ! HAVE_BOLOS
           tx_len = 0;
           G_io_apdu_buffer[(tx_len)++] = (SWO_SEC_PIN_15 >> 8) & 0xFF;
           G_io_apdu_buffer[(tx_len)++] = (SWO_SEC_PIN_15) & 0xFF;