gui: do not let user try recovery if one block left

wizardsardine · Jul 23, 2024 · 755e727 · 755e727
1 parent ee9cfb9
commit 755e727
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/gui/src/app/state/recovery.rs b/gui/src/app/state/recovery.rs
@@ -247,7 +247,7 @@ fn recovery_paths(wallet: &Wallet, coins: &[Coin], blockheight: i32) -> Vec<Reco
                 .iter()
                 .filter(|coin| {
                     coin.spend_info.is_none()
-                        && remaining_sequence(coin, blockheight as u32, sequence) <= 1
+                        && remaining_sequence(coin, blockheight as u32, sequence) < 1
                 })
                 .fold(
                     (0, Amount::from_sat(0)),

diff --git a/gui/src/app/view/recovery.rs b/gui/src/app/view/recovery.rs
@@ -96,10 +96,14 @@ pub fn recovery<'a>(
                 Container::new(
                     Column::new()
                         .spacing(20)
-                        .push(text(format!(
-                            "{} recovery paths will be available at the next block, select one:",
-                            recovery_paths.len()
-                        )))
+                        .push(text(if recovery_paths.len() == 1 {
+                            "1 recovery path is available, please select:".to_string()
+                        } else {
+                            format!(
+                                "{} recovery paths are available, select one:",
+                                recovery_paths.len()
+                            )
+                        }))
                         .push(Column::with_children(recovery_paths).spacing(20)),
                 )
                 .style(theme::Container::Card(theme::Card::Simple))
@@ -190,7 +194,7 @@ pub fn recovery_path_view<'a>(
                         .push(text(format!(
                             "{} coin{} totalling",
                             number_of_coins,
-                            if number_of_coins > 0 { "s" } else { "" }
+                            if number_of_coins > 1 { "s" } else { "" }
                         )))
                         .push(amount(&total_amount)),
                 )