feat(core): Do not confirm coordinator identifier on Trezor.

[no changelog]

core/src/apps/bitcoin/authorize_coinjoin.py

@@ -1,10 +1,10 @@
 from micropython import const
 from typing import TYPE_CHECKING
 
-from trezor import ui, wire
+from trezor import wire
 from trezor.enums import ButtonRequestType
 from trezor.messages import AuthorizeCoinJoin, Success
-from trezor.ui.layouts import confirm_action, confirm_coinjoin, confirm_metadata
+from trezor.ui.layouts import confirm_coinjoin, confirm_metadata
 
 from apps.common import authorization, safety_checks
 from apps.common.keychain import FORBIDDEN_KEY_PATH
@@ -50,16 +50,12 @@ async def authorize_coinjoin(
     if msg.address_n[0] != SLIP25_PURPOSE and safety_checks.is_strict():
         raise FORBIDDEN_KEY_PATH
 
-    await confirm_action(
+    max_fee_per_vbyte = format_fee_rate(
-        ctx,
+        msg.max_fee_per_kvbyte / 1000, coin, include_shortcut=True
-        "coinjoin_coordinator",
-        title="Authorize CoinJoin",
-        description="Do you want to take\npart in a series of\nCoinJoin rounds at:\n{}",
-        description_param=msg.coordinator,
-        description_param_font=ui.MONO,
-        icon=ui.ICON_RECOVERY,
     )
 
+    await confirm_coinjoin(ctx, msg.max_rounds, max_fee_per_vbyte)
+
     validation_path = msg.address_n + [0] * BIP32_WALLET_DEPTH
     await validate_path(
         ctx,
@@ -71,10 +67,6 @@ async def authorize_coinjoin(
         ),
     )
 
-    max_fee_per_vbyte = format_fee_rate(
-        msg.max_fee_per_kvbyte / 1000, coin, include_shortcut=True
-    )
-
     if msg.max_fee_per_kvbyte > coin.maxfee_kb:
         await confirm_metadata(
             ctx,
@@ -85,8 +77,6 @@ async def authorize_coinjoin(
             ButtonRequestType.FeeOverThreshold,
         )
 
-    await confirm_coinjoin(ctx, msg.max_rounds, max_fee_per_vbyte)
-
     authorization.set(msg)
 
     return Success(message="CoinJoin authorized")

tests/ui_tests/fixtures.json

@@ -619,15 +619,15 @@
 "TT_binance-test_sign_tx.py::test_binance_sign_message[message0-expected_response0]": "fab7b62cab76ae2e4370d9ce113569b3aa2d089a5dbc365c8920731f756a4f37",
 "TT_binance-test_sign_tx.py::test_binance_sign_message[message1-expected_response1]": "805fc5ef8074c3f5cfee5f7128c2cd068fef42f4f01f9450578f50e791ff811f",
 "TT_binance-test_sign_tx.py::test_binance_sign_message[message2-expected_response2]": "323e0a474e71ede187ee1332e42952aeca501b42da95f88b2bad5445a3db858c",
-"TT_bitcoin-test_authorize_coinjoin.py::test_cancel_authorization": "c08baf72201dc833ecc085daded257366f3fb561be9ac164e0fac0d6f22f18ca",
+"TT_bitcoin-test_authorize_coinjoin.py::test_cancel_authorization": "e7ebc351e565bfc638577e896fdbde3ee336ef03b1bd001bacfa0c98f58c7134",
 "TT_bitcoin-test_authorize_coinjoin.py::test_get_address": "38ac4356550ad62c44892d6cff37c23020be6c08f9789a42e712714f57a2e1af",
 "TT_bitcoin-test_authorize_coinjoin.py::test_get_public_key": "46c69b84e796678e690112fea4aca72dcffacb8a91a6e8afadeea05fb02a09aa",
-"TT_bitcoin-test_authorize_coinjoin.py::test_multisession_authorization": "e0628b588c1efcf4f09afb0aeb6a49e257eff6fe2c9e0f34477f0a9f6a148bf2",
+"TT_bitcoin-test_authorize_coinjoin.py::test_multisession_authorization": "548953fa85ddf8a24de821f02b2fff66a9d25ac697b03d76a3302243dd58ab4b",
-"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx": "cf79ee5ee33f6067831104a750370e35ff080950f41ab306475d0aa07a3d00a5",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx": "f9ca0b95ef7d4cba17e893c9f6c4ac3becdf6ff3a3c66843b97de323f2ecc9f6",
-"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_large": "5f23cd4859f92a36ab1fb262bbf9221d9ecdbd85510060df678373cf4377c9e3",
+"TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_large": "65774735f864182e68335ccfd1a989224e4f2a1d4cc0e9f5bf81f87fe8bc9c0e",
 "TT_bitcoin-test_authorize_coinjoin.py::test_sign_tx_spend": "20a381f5a0ae5ff6f29b7d08f4959d809799727817de1238ab16f9b48868bf50",
-"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_account_type": "c08baf72201dc833ecc085daded257366f3fb561be9ac164e0fac0d6f22f18ca",
+"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_account_type": "e7ebc351e565bfc638577e896fdbde3ee336ef03b1bd001bacfa0c98f58c7134",
-"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_coordinator": "c08baf72201dc833ecc085daded257366f3fb561be9ac164e0fac0d6f22f18ca",
+"TT_bitcoin-test_authorize_coinjoin.py::test_wrong_coordinator": "e7ebc351e565bfc638577e896fdbde3ee336ef03b1bd001bacfa0c98f58c7134",
 "TT_bitcoin-test_bcash.py::test_attack_change_input": "a7b230e002cc350c3e94b81cd730f9ba39e3e59ecd4bce264348af4304422ade",
 "TT_bitcoin-test_bcash.py::test_send_bch_change": "a7b230e002cc350c3e94b81cd730f9ba39e3e59ecd4bce264348af4304422ade",
 "TT_bitcoin-test_bcash.py::test_send_bch_external_presigned": "3b9b05f284da4af74552c552524ddd54be96bff8968b71f519bc684f1fda2d01",