nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #486: Make home warning message relative to timelock

Browse Source 
25fffb2c52f87715a69cee3fd0f6cda64e2185f2 Make home warning message relative to timelock (edouard)

Pull request description:

  close #461

ACKs for top commit:
  edouardparis:
    Self-ACK 25fffb2c52f87715a69cee3fd0f6cda64e2185f2

Tree-SHA512: fd4ff1d86c08b4c5d383ba941231970fe768eed9277cd489850272761a2d85cf83221dd6d363a23aeda07e1aaa27a287f8cbcc7216087e11f1bfb9742c0c704c
This commit is contained in:
edouard 2023-05-08 10:07:23 +02:00
commit 4945adeec3
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/src/app/state/mod.rs
View File

@ -133,8 +133,9 @@ impl State for Home {
let timelock = self.wallet.main_descriptor.first_timelock_value();
let seq =
remaining_sequence(&coin, cache.blockheight as u32, timelock);
// number of block in a day
if seq <= 144 {
// Warn user for coins that are expiring in less than 10 percent of
// the timelock.
if seq <= timelock as u32 * 10 / 100 {
self.expiring_coins.push(coin.outpoint);
}
if let Some(last) = &mut self.remaining_sequence {

37
gui/src/app/view/coins.rs
View File

@ -230,14 +230,31 @@ pub fn expire_message_units(sequence: u32) -> Vec<String> {
n_minutes -= n_months * 43830;
let n_days = n_minutes / 1440;
[(n_years, "year"), (n_months, "month"), (n_days, "day")]
.iter()
.filter_map(|(n, u)| {
if *n != 0 {
Some(format!("{} {}{}", n, u, if *n > 1 { "s" } else { "" }))
} else {
None
}
})
.collect()
#[allow(clippy::nonminimal_bool)]
if n_days != 0 || n_months != 0 || n_days != 0 {
[(n_years, "year"), (n_months, "month"), (n_days, "day")]
.iter()
.filter_map(|(n, u)| {
if *n != 0 {
Some(format!("{} {}{}", n, u, if *n > 1 { "s" } else { "" }))
} else {
None
}
})
.collect()
} else {
n_minutes -= n_days * 1440;
let n_hours = n_minutes / 60;
n_minutes -= n_hours * 60;
[(n_hours, "hour"), (n_minutes, "minute")]
.iter()
.filter_map(|(n, u)| {
if *n != 0 {
Some(format!("{} {}{}", n, u, if *n > 1 { "s" } else { "" }))
} else {
None
}
})
.collect()
}
}