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

fix inconsistencies between spend and coins panel

Browse Source 
Add remaining timelock and unconfirmed label.

close #232
This commit is contained in:
edouard 2022-12-16 17:25:41 +01:00
parent c4481ca292
commit aa32444318
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,15 @@ fn coin_list_view(
))
}
})
.push_maybe(if coin.block_height.is_none() {
Some(
Container::new(text(" Unconfirmed ").small())
.padding(3)
.style(badge::PillStyle::Simple),
)
} else {
None
})
.spacing(10)
.align_items(Alignment::Center)
.width(Length::Fill),

33
gui/src/app/view/spend/step.rs
View File

@ -11,7 +11,7 @@ use crate::{
error::Error,
view::{message::*, modal},
},
daemon::model::Coin,
daemon::model::{remaining_sequence, Coin},
ui::{
color,
component::{
@ -198,8 +198,15 @@ fn coin_list_view<'a>(
icon::square_icon()
})
.push(badge::coin())
.push_maybe(if let Some(b) = coin.block_height {
if blockheight > b as u32 + timelock {
.push_maybe(if coin.spend_info.is_some() {
Some(
Container::new(text(" Spent ").small())
.padding(3)
.style(badge::PillStyle::Success),
)
} else {
let seq = remaining_sequence(coin, blockheight, timelock);
if seq == 0 {
Some(Container::new(
Row::new()
.spacing(5)
@ -209,18 +216,32 @@ fn coin_list_view<'a>(
)
.align_items(Alignment::Center),
))
} else {
} else if seq < timelock * 10 / 100 {
Some(Container::new(
Row::new()
.spacing(5)
.push(
text(format!(" {}", b as u32 + timelock - blockheight))
.small(),
text(format!(" {}", seq)).small().style(color::WARNING),
)
.push(icon::hourglass_icon().small().style(color::WARNING))
.align_items(Alignment::Center),
))
} else {
Some(Container::new(
Row::new()
.spacing(5)
.push(text(format!(" {}", seq)).small())
.push(icon::hourglass_icon().small())
.align_items(Alignment::Center),
))
}
})
.push_maybe(if coin.block_height.is_none() {
Some(
Container::new(text(" Unconfirmed ").small())
.padding(3)
.style(badge::PillStyle::Simple),
)
} else {
None
})