Skip to content

PR fix for issue #189 (GUI: have a small explanatory sentence for the rescan date) #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TChukwuleta wants to merge 6 commits into
base: master
Choose a base branch
from
+12 −3
Open

PR fix for issue #189 (GUI: have a small explanatory sentence for the rescan date) #537

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23829bb
improvement for wallet rescan
TChukwuleta May 22, 2023
9bdcfb7
Merge branch 'wizardsardine:master' into master
TChukwuleta May 22, 2023
d6c0b31
include context for wallet rescan
TChukwuleta May 22, 2023
8248e45
Merge branch 'master' of https://github.com/TChukwuleta/liana
TChukwuleta May 22, 2023
94257fb
fix whitespace issue
TChukwuleta May 23, 2023
3a4846c
Merge branch 'wizardsardine:master' into master
TChukwuleta May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions gui/src/app/view/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,14 @@ pub fn rescan<'a>(
} else {
None
})
.spacing(20)
.spacing(5)
.align_items(Alignment::Center)
.width(Length::Fill),
)
.push(text("Rescan the local blockchain for any missing wallet transaction and rebuild the correct wallet balance")
.width(Length::Fill)
.size(20)
.style(color::GREY_3))
.push(separation().width(Length::Fill))
.push(if let Some(p) = scan_progress {
Container::new(
Expand Down Expand Up @@ -499,7 +503,8 @@ pub fn rescan<'a>(
})
&& is_ok_and(&u32::from_str(&day.value), |&v| v > 0 && v <= 31))
{
Row::new().push(Column::new().width(Length::Fill)).push(
Row::new().push(Column::new().width(Length::Fill))

@edouardparis edouardparis May 25, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Row::new().push(Column::new().width(Length::Fill))
Row::new().push(Space::with_width(Length::Fill))

.push(
button::primary(None, "Start rescan")
.on_press(SettingsEditMessage::Confirm)
.width(Length::Shrink),
Expand All @@ -510,7 +515,11 @@ pub fn rescan<'a>(
.width(Length::Shrink),
)
} else {
Row::new().push(Column::new().width(Length::Fill)).push(
Row::new()
.push(text("Rescan date cannot be earlier than wallet creation date or pruned date (if applies)").width(Length::Fill)
.size(15)
.style(color::GREY_3))
.push(Column::new().width(Length::Fill)).push(

@edouardparis edouardparis May 25, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recent Iced version introduced Space widget that help us to get ride of empty Column

Suggested change
.push(Column::new().width(Length::Fill)).push(
.push(Space::with_width(Length::Fill)).push(

button::primary(None, "Start rescan").width(Length::Shrink),
)
},
Expand Down