Skip to content

Commit 5386733

Browse files
committed
Merge branch 'ui-trait'
2 parents d1c8d6f + e5d8275 commit 5386733

File tree

10 files changed

+695
-731
lines changed

10 files changed

+695
-731
lines changed

src/rust/bitbox02-rust/src/hww/api/bitcoin.rs

Lines changed: 121 additions & 119 deletions
Large diffs are not rendered by default.

src/rust/bitbox02-rust/src/hww/api/bitcoin/registration.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,19 @@ pub fn process_is_script_config_registered(
6666
}
6767
}
6868

69-
async fn get_name(request: &pb::BtcRegisterScriptConfigRequest) -> Result<String, Error> {
69+
async fn get_name<W: Workflows>(
70+
workflows: &mut W,
71+
request: &pb::BtcRegisterScriptConfigRequest,
72+
) -> Result<String, Error> {
7073
let name = if request.name.is_empty() {
71-
confirm::confirm(&confirm::Params {
72-
title: "Register",
73-
body: "Please name this\naccount",
74-
accept_is_nextarrow: true,
75-
..Default::default()
76-
})
77-
.await?;
74+
workflows
75+
.confirm(&confirm::Params {
76+
title: "Register",
77+
body: "Please name this\naccount",
78+
accept_is_nextarrow: true,
79+
..Default::default()
80+
})
81+
.await?;
7882

7983
let name = trinary_input_string::enter(
8084
&trinary_input_string::Params {
@@ -115,7 +119,7 @@ pub async fn process_register_script_config<W: Workflows>(
115119
}) => {
116120
let coin = BtcCoin::try_from(*coin)?;
117121
let coin_params = params::get(coin);
118-
let name = get_name(request).await?;
122+
let name = get_name(workflows, request).await?;
119123
super::multisig::validate(multisig, keypath)?;
120124
let xpub_type = XPubType::try_from(request.xpub_type)?;
121125
super::multisig::confirm_extended(
@@ -150,7 +154,7 @@ pub async fn process_register_script_config<W: Workflows>(
150154
}) => {
151155
let coin = BtcCoin::try_from(*coin)?;
152156
let coin_params = params::get(coin);
153-
let name = get_name(request).await?;
157+
let name = get_name(workflows, request).await?;
154158
let parsed = super::policies::parse(policy, coin)?;
155159
parsed
156160
.confirm(

0 commit comments

Comments
 (0)