Merge branch 'confirm-numwords'

Author: benma

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

@@ -121,15 +121,6 @@ async fn process_bip39(hal: &mut impl crate::hal::Hal) -> Result<(), Error> {
         })
         .await?;
 
-    hal.ui()
-        .confirm(&confirm::Params {
-            title: "",
-            body: &format!("{} word mnemonic\nfollows", num_words),
-            accept_is_nextarrow: true,
-            ..Default::default()
-        })
-        .await?;
-
     let mnemonic = keystore::bip85_bip39(num_words, index)?;
     let words: Vec<&str> = mnemonic.split(' ').collect();
     mnemonic::show_and_confirm_mnemonic(hal, &words).await?;

src/rust/bitbox02-rust/src/workflow/mnemonic.rs

@@ -114,6 +114,16 @@ pub async fn show_and_confirm_mnemonic(
     hal: &mut impl crate::hal::Hal,
     words: &[&str],
 ) -> Result<(), CancelError> {
+    hal.ui()
+        .confirm(&confirm::Params {
+            title: "",
+            body: &format!("{} words follow", words.len()),
+            accept_is_nextarrow: true,
+            ..Default::default()
+        })
+        .await
+        .map_err(|_| CancelError::Cancelled)?;
+
     // Part 1) Scroll through words
     show_mnemonic(words).await?;