Merge pull request #56 from LedgerHQ/develop

Merge develop into master

Makefile

@@ -29,7 +29,7 @@ APPNAME = XRP
 
 APPVERSION_M=2
 APPVERSION_N=4
-APPVERSION_P=0
+APPVERSION_P=1
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 # Application source files

src/apdu/messages/get_public_key.c

@@ -52,17 +52,21 @@ void on_address_confirmed() {
     G_io_apdu_buffer[tx++] = 0x00;
     // Send back the response, do not restart the event loop
     io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, tx);
+#ifndef HAVE_NBGL
     // Display back the original UX
     display_idle_menu();
+#endif
 }
 
 void on_address_rejected() {
     G_io_apdu_buffer[0] = 0x69;
     G_io_apdu_buffer[1] = 0x85;
     // Send back the response, do not restart the event loop
     io_exchange(CHANNEL_APDU | IO_RETURN_AFTER_TX, 2);
+#ifndef HAVE_NBGL
     // Display back the original UX
     display_idle_menu();
+#endif
 }
 
 void handle_get_public_key(uint8_t p1,

src/apdu/messages/sign_transaction.c

@@ -141,8 +141,10 @@ void sign_transaction() {
         return;
     }
 
+#ifndef HAVE_NBGL
     // Display back the original UX
     display_idle_menu();
+#endif
 }
 
 void reject_transaction() {
@@ -164,7 +166,9 @@ void reject_transaction() {
 
     // Reset transaction context and display back the original UX
     reset_transaction_context();
+#ifndef HAVE_NBGL
     display_idle_menu();
+#endif
 }
 
 bool is_first(uint8_t p1) {

src/ui/transaction/review_menu_nbgl.c

@@ -77,7 +77,7 @@ void display_review_menu(parseResult_t *transaction_param, resultAction_t callba
                        &C_icon_XRP_64px,
                        "Review transaction",
                        NULL,
-                       "Sign transaction",
+                       "Sign transaction?",
                        reviewChoice);
 }
 #endif  // HAVE_NBGL

tests/functional_test.py

@@ -128,7 +128,7 @@ def test_sign_valid_tx(backend: BackendInterface,
                        scenario_navigator: NavigateWithScenario,
                        raw_tx_path: str):
     if raw_tx_path.endswith("19-really-stupid-tx.raw"):
-        pytest.skip(f"skip invalid tx {raw_tx_path}")
+        pytest.skip(f"skip invalid tx from '{Path(raw_tx_path).stem}'")
 
     xrp = XRPClient(backend, firmware, navigator)