Small improvements

src_nbgl/ui_tx_simulation.c

@@ -27,6 +27,9 @@ static bool g_response_expected;
  * @param[in] callback Callback to be called after the user has made a choice
  */
 void ui_tx_simulation_error(nbgl_choiceCallback_t callback) {
+#ifdef HAVE_PIEZO_SOUND
+    io_seproxyhal_play_tune(TUNE_NEUTRAL);
+#endif  // HAVE_PIEZO_SOUND
     nbgl_useCaseChoice(&C_Denied_Circle_64px,
                        "Transaction Check failed because of technical reasons",
                        "Reject this transaction and try again. "
@@ -180,6 +183,9 @@ void ui_tx_simulation_opt_in(bool response_expected) {
     // add button and footer on bottom
     nbgl_layoutAddChoiceButtons(layoutCtx, &buttonsInfo);
 
+#ifdef HAVE_PIEZO_SOUND
+    io_seproxyhal_play_tune(TUNE_LOOK_AT_ME);
+#endif  // HAVE_PIEZO_SOUND
     nbgl_layoutDraw(layoutCtx);
     nbgl_refresh();
 }

tests/ragger/test_blind_sign.py

@@ -24,8 +24,6 @@
 BIP32_PATH = "m/44'/60'/0'/0/0"
 DEVICE_ADDR: Optional[bytes] = None
 
-# TODO: do one test with nonce display
-
 
 @pytest.fixture(name="reject", params=[False, True])
 def reject_fixture(request) -> bool:
@@ -37,6 +35,14 @@ def amount_fixture(request) -> float:
     return request.param
 
 
+def common_get_address(app_client: EthAppClient) -> None:
+    global DEVICE_ADDR
+    if DEVICE_ADDR is None:
+        with app_client.get_public_addr(bip32_path=BIP32_PATH, display=False):
+            pass
+        _, DEVICE_ADDR, _ = ResponseParser.pk_addr(app_client.response().data)
+
+
 def common_tx_params(amount: float) -> dict:
     with open(f"{ABIS_FOLDER}/erc20.json", encoding="utf-8") as file:
         contract = Web3().eth.contract(
@@ -61,22 +67,52 @@ def common_tx_params(amount: float) -> dict:
     }
 
 
+def common_blind_sign(scenario_navigator: NavigateWithScenario,
+                      test_name: str,
+                      app_client: EthAppClient,
+                      tx_params: dict,
+                      reject: bool = False) -> dict:
+    try:
+        with app_client.sign(BIP32_PATH, tx_params):
+            if reject:
+                test_name += "_rejected"
+
+            if tx_params["value"] > 0.0:
+                test_name += "_nonzero"
+
+            if reject:
+                scenario_navigator.review_reject_with_warning(test_name=test_name)
+            else:
+                scenario_navigator.review_approve_with_warning(test_name=test_name)
+
+    except ExceptionRAPDU as e:
+        assert reject
+        assert e.status == StatusWord.CONDITION_NOT_SATISFIED
+    else:
+        assert not reject
+        # verify signature
+        vrs = ResponseParser.signature(app_client.response().data)
+        addr = recover_transaction(tx_params, vrs)
+        assert addr == DEVICE_ADDR
+
+
 # Token approval, would require providing the token metadata from the CAL
 def test_blind_sign(firmware: Firmware,
                     backend: BackendInterface,
                     navigator: Navigator,
                     scenario_navigator: NavigateWithScenario,
-                    default_screenshot_path: Path,
                     test_name: str,
                     reject: bool,
                     amount: float,
                     simu_params: Optional[TxSimu] = None):
-    global DEVICE_ADDR
-    app_client = EthAppClient(backend)
-
     if reject and amount > 0.0:
         pytest.skip()
 
+    app_client = EthAppClient(backend)
+    common_get_address(app_client)
+
+    settings_toggle(firmware, navigator, [SettingID.BLIND_SIGNING])
+
     tx_params = common_tx_params(amount)
 
     if not reject and simu_params is not None:
@@ -87,48 +123,29 @@ def test_blind_sign(firmware: Firmware,
         response = app_client.provide_tx_simulation(simu_params)
         assert response.status == StatusWord.OK
 
-    settings_toggle(firmware, navigator, [SettingID.BLIND_SIGNING])
-    if DEVICE_ADDR is None:
-        with app_client.get_public_addr(bip32_path=BIP32_PATH, display=False):
-            pass
-        _, DEVICE_ADDR, _ = ResponseParser.pk_addr(app_client.response().data)
+    common_blind_sign(scenario_navigator,
+                      test_name,
+                      app_client,
+                      tx_params,
+                      reject)
 
-    try:
-        with app_client.sign(BIP32_PATH, tx_params):
-            if reject:
-                test_name += "_rejected"
-
-            if amount > 0.0:
-                test_name += "_nonzero"
-
-            if firmware.is_nano:
-                end_text = "^Accept risk"
-                moves = [NavInsID.RIGHT_CLICK]
-            else:
-                end_text = "^Hold to sign$"
-                moves = [NavInsID.USE_CASE_CHOICE_REJECT]
 
-            if not firmware.is_nano:
-                # Warning Screen
-                navigator.navigate_and_compare(default_screenshot_path,
-                                               f"{test_name}/warning",
-                                               moves,
-                                               screen_change_after_last_instruction=False)
+# Token approval, would require providing the token metadata from the CAL
+def test_blind_sign_nonce(firmware: Firmware,
+                          backend: BackendInterface,
+                          navigator: Navigator,
+                          scenario_navigator: NavigateWithScenario,
+                          test_name: str):
+    app_client = EthAppClient(backend)
+    common_get_address(app_client)
 
-            if reject:
-                scenario_navigator.review_reject(test_name=test_name)
-            else:
-                scenario_navigator.review_approve(test_name=test_name, custom_screen_text=end_text)
+    settings_toggle(firmware, navigator, [SettingID.BLIND_SIGNING, SettingID.NONCE])
 
-    except ExceptionRAPDU as e:
-        assert reject
-        assert e.status == StatusWord.CONDITION_NOT_SATISFIED
-    else:
-        assert not reject
-        # verify signature
-        vrs = ResponseParser.signature(app_client.response().data)
-        addr = recover_transaction(tx_params, vrs)
-        assert addr == DEVICE_ADDR
+    tx_params = common_tx_params(1.2)
+    common_blind_sign(scenario_navigator,
+                      test_name,
+                      app_client,
+                      tx_params)
 
 
 def test_blind_sign_reject_in_risk_review(firmware: Firmware,
@@ -158,13 +175,8 @@ def test_sign_parameter_selector(firmware: Firmware,
                                  navigator: Navigator,
                                  test_name: str,
                                  default_screenshot_path: Path):
-    global DEVICE_ADDR
     app_client = EthAppClient(backend)
-
-    if DEVICE_ADDR is None:
-        with app_client.get_public_addr(bip32_path=BIP32_PATH, display=False):
-            pass
-        _, DEVICE_ADDR, _ = ResponseParser.pk_addr(app_client.response().data)
+    common_get_address(app_client)
 
     settings_toggle(firmware, navigator, [SettingID.BLIND_SIGNING, SettingID.DEBUG_DATA])
 

tests/ragger/test_tx_simulation.py

@@ -255,7 +255,6 @@ def test_tx_simulation_blind_sign(firmware: Firmware,
                                   navigator: Navigator,
                                   scenario_navigator: NavigateWithScenario,
                                   test_name: str,
-                                  default_screenshot_path: Path,
                                   config: str) -> None:
     """Test the TX Simulation APDU with a Blind Sign transaction"""
 
@@ -276,7 +275,6 @@ def test_tx_simulation_blind_sign(firmware: Firmware,
                backend,
                navigator,
                scenario_navigator,
-               default_screenshot_path,
                test_name,
                False,
                0.0,