Merge branch 'develop' into feature-sync

.github/workflows/build_and_functional_tests.yml

@@ -10,6 +10,15 @@ name: Build and run functional tests using ragger through reusable workflow
 
 on:
   workflow_dispatch:
+    inputs:
+      golden_run:
+        type: choice
+        required: true
+        default: 'Raise an error (default)'
+        description: CI behavior if the test snaphots are different than expected.
+        options:
+          - 'Raise an error (default)'
+          - 'Open a PR'
   push:
     branches:
       - master
@@ -29,3 +38,4 @@ jobs:
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_ragger_tests.yml@v1
     with:
       download_app_binaries_artifact: compiled_app_binaries
+      regenerate_snapshots: ${{ inputs.golden_run == 'Open a PR' }}

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

@@ -15,13 +15,16 @@
 from ragger.error import ExceptionRAPDU
 from .xrp import XRPClient, Errors
 from .utils import DEFAULT_PATH, DEFAULT_BIP32_PATH
-from .utils import ROOT_SCREENSHOT_PATH, verify_ecdsa_secp256k1, verify_version
+from .utils import verify_ecdsa_secp256k1, verify_version
 
 
-def test_app_configuration(backend: BackendInterface, firmware: Firmware, navigator: Navigator):
+def test_app_configuration(backend: BackendInterface,
+                           firmware: Firmware,
+                           navigator: Navigator,
+                           default_screenshot_path: Path):
     xrp = XRPClient(backend, firmware, navigator)
     version = xrp.get_configuration()
-    verify_version(version)
+    verify_version(default_screenshot_path, version)
 
 
 def test_sign_too_large(backend: BackendInterface, firmware: Firmware, navigator: Navigator):
@@ -70,11 +73,10 @@ def test_get_public_key_no_confirm(backend: BackendInterface,
 def test_get_public_key_confirm(backend: BackendInterface,
                                 firmware: Firmware,
                                 navigator: Navigator,
-                                scenario_navigator: NavigateWithScenario,
-                                test_name: str):
+                                scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
     with xrp.get_pubkey_confirm():
-        scenario_navigator.address_review_approve(ROOT_SCREENSHOT_PATH, test_name)
+        scenario_navigator.address_review_approve()
 
     # Check the status (Asynchronous)
     reply = xrp.get_async_response()
@@ -84,13 +86,12 @@ def test_get_public_key_confirm(backend: BackendInterface,
 def test_get_public_key_reject(backend: BackendInterface,
                                firmware: Firmware,
                                navigator: Navigator,
-                               scenario_navigator: NavigateWithScenario,
-                               test_name: str):
+                               scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
 
     with pytest.raises(ExceptionRAPDU) as err:
         with xrp.get_pubkey_confirm():
-            scenario_navigator.address_review_reject(ROOT_SCREENSHOT_PATH, test_name)
+            scenario_navigator.address_review_reject()
 
     # Assert we have received a refusal
     assert err.value.status == Errors.SW_WRONG_ADDRESS
@@ -100,8 +101,7 @@ def test_get_public_key_reject(backend: BackendInterface,
 def test_sign_reject(backend: BackendInterface,
                      firmware: Firmware,
                      navigator: Navigator,
-                     scenario_navigator: NavigateWithScenario,
-                     test_name: str):
+                     scenario_navigator: NavigateWithScenario):
     xrp = XRPClient(backend, firmware, navigator)
 
     # pragma pylint: disable=line-too-long
@@ -115,7 +115,7 @@ def test_sign_reject(backend: BackendInterface,
     # Send the APDU (Asynchronous)
     with pytest.raises(ExceptionRAPDU) as err:
         with xrp.sign(DEFAULT_BIP32_PATH + message):
-            scenario_navigator.review_reject(ROOT_SCREENSHOT_PATH, test_name)
+            scenario_navigator.review_reject()
 
     # Assert we have received a refusal
     assert err.value.status == Errors.SW_WRONG_ADDRESS
@@ -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)
 
@@ -144,7 +144,7 @@ def test_sign_valid_tx(backend: BackendInterface,
     else:
         text = "^Hold to sign$"
     with xrp.sign(DEFAULT_BIP32_PATH + tx):
-        scenario_navigator.review_approve(ROOT_SCREENSHOT_PATH, snapdir, text)
+        scenario_navigator.review_approve(test_name=snapdir, custom_screen_text=text)
 
     reply = xrp.get_async_response()
     assert reply and reply.status == Errors.SW_SUCCESS