liana-gui: Iced v13 #1550

edouardparis · 2025-01-21T16:34:36Z

update liana-ui
update liana-gui

3ced1db move the unlocking of bb to a method (edouardparis) Pull request description: This is preparatory work for #1550 ACKs for top commit: edouardparis: Self-ACK 3ced1db Tree-SHA512: 1ff5aef26ed13446750a5f1c339d47b35a15227df98bb57321f81520294f35fd23fd226f3ccf515a56f07b8ec5b4f1d9c0fcb854f743d862389ab4605afcd3df

jp1ac4 · 2025-01-31T16:32:55Z

I've done some initial testing of 0514b44 and found the following:

Items in dropdowns no longer have green borders:
Error message banners are no longer displaying correctly:
Signing device rows in the modal are no longer clearly marked:

liana-gui/Cargo.toml

pythcoiner · 2025-02-03T09:56:09Z

liana-ui/src/component/text.rs

@@ -11,98 +11,98 @@ pub const P1_SIZE: u16 = 16;
 pub const P2_SIZE: u16 = 14;
 pub const CAPTION_SIZE: u16 = 12;

-pub fn h1<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
-    iced::widget::Text::new(content)
+pub fn h1<'a>(content: impl Display) -> iced::widget::Text<'a, Theme> {


maybe here it worth it to have a macro to build all these helper functions as they all have the same signature? it could be usefull for readability & further maintenance

jp1ac4 · 2025-02-03T11:26:53Z

Testing 209557a:

2. Error message banners are no longer displaying correctly:
3. Signing device rows in the modal are no longer clearly marked:

Both fixed
..
Some new issues found:

The address shown below the QR code was previously fitting on a single line:
"Delete wallet" button background does not change colour when hovered:

jp1ac4 · 2025-02-03T12:41:13Z

Also on 209557a:

The "0 payment" text seems to be a different colour/boldness than the other rows:

pythcoiner · 2025-02-03T12:45:56Z

The address shown below the QR code was previously fitting on a single line:

previoulsy the address were not 100% displayed w/ taproot, there is an issue for this

see #1051

jp1ac4 · 2025-02-03T12:59:44Z

previoulsy the address were not 100% displayed w/ taproot, there is an issue for this

see #1051

Ah I see. Note that the address in my screenshot above is displayed on a single line in master, but we can come back to this then as part of your PR.

pythcoiner · 2025-02-03T13:15:44Z

previoulsy the address were not 100% displayed w/ taproot, there is an issue for this
see #1051

Ah I see. Note that the address in my screenshot above is displayed on a single line in master, but we can come back to this then as part of your PR.

yeah i think there is a new feature that wrap the line if too long content

pythcoiner · 2025-02-03T13:27:09Z

liana-gui/Cargo.toml

@@ -48,7 +48,7 @@ chrono = "0.4.38"
 # Used for managing internal bitcoind
 base64 = "0.21"
 bitcoin_hashes = "0.12"
-reqwest = { version = "0.11", default-features=false, features = ["json", "rustls-tls"] }
+reqwest = { version = "0.11", default-features=false, features = ["json", "rustls-tls", "stream"] }


maybe the PR summary should indicate what the stream feature is used for?

liana-gui/src/export.rs

pythcoiner · 2025-02-03T14:26:13Z

liana-gui/src/download.rs

+        let response = reqwest::get(&url).await?;
+        let total = response
+            .content_length()
+            .ok_or(DownloadError::NoContentLength)?;


I think we should not error in this case, it's better to get the file w/o update of the download process instead not get the file at all.

We expect it still to be here as we download a static file. I think I should not modify the logic from the iced example.

from reqwest:

/// Get the content-length of this response, if known. /// /// Reasons it may not be known: /// /// - The server didn't send a `content-length` header. /// - The response is compressed and automatically decoded (thus changing /// the actual decoded length). pub fn content_length(&self) -> Option<u64> {

I think we should not error in these mentionned cases

178f818
Ok, in that case, we do not send the progress Message as we are not able to calculate it.

liana-gui/src/download.rs

liana-gui/src/hw.rs

pythcoiner · 2025-02-03T17:21:55Z

liana-gui/src/loader.rs

@@ -377,6 +327,65 @@ impl Loader {
    }
 }

+fn get_bitcoind_log(log_path: PathBuf) -> impl Stream<Item = Option<String>> {
+    channel(1, move |mut output| async move {
+        loop {


is that intended that we never break this loop?

From my understanding, the iced runtime will kill the stream as soon as the subscription is not returned.
https://docs.rs/iced/latest/iced/struct.Subscription.html#the-lifetime-of-a-subscription

liana-gui/src/loader.rs

jp1ac4 · 2025-02-04T08:45:30Z

On 8c800a2:

2. "Delete wallet" button background does not change colour when hovered:
3. The "0 payment" text seems to be a different colour/boldness than the other rows:

Fixed.

Items in dropdowns no longer have green borders:

Fixed (non-selected items are no longer greyed out and background changes to green when option is highlighted).
As noted elsewhere, the dropdown no longer has a green border when hovered, but this is an intended change.

jp1ac4

tACK 178f818.

nondiremanuel assigned edouardparis Jan 22, 2025

nondiremanuel added this to the v10 Liana - UI fixes and other activities milestone Jan 22, 2025

edouardparis force-pushed the iced-v13 branch from 6a1f240 to 257f5e5 Compare January 28, 2025 10:57

edouardparis mentioned this pull request Jan 28, 2025

move the unlocking of bitbox to a method #1557

Merged

edouardparis force-pushed the iced-v13 branch 8 times, most recently from 902a373 to 0514b44 Compare January 31, 2025 15:31

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/Cargo.toml Outdated Show resolved Hide resolved

pythcoiner reviewed Feb 3, 2025

View reviewed changes

edouardparis force-pushed the iced-v13 branch 2 times, most recently from 9a8f3ed to 209557a Compare February 3, 2025 11:13

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/export.rs Outdated Show resolved Hide resolved

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/export.rs Outdated Show resolved Hide resolved

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/export.rs Outdated Show resolved Hide resolved

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/download.rs Outdated Show resolved Hide resolved

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/hw.rs Outdated Show resolved Hide resolved

edouardparis added 7 commits February 3, 2025 15:47

iced v0.13

ad297d1

fix subscriptions

a4adab5

fix main

bf8c2ea

fix sandbox for liana-gui tests

c76109e

fix launcher: wallet button

4fbef50

fix hw buttons: use secondary button

cfa7371

fix warning banner colors

8c800a2

edouardparis force-pushed the iced-v13 branch from 209557a to 8c800a2 Compare February 3, 2025 15:24

edouardparis marked this pull request as ready for review February 3, 2025 15:42

pythcoiner reviewed Feb 3, 2025

View reviewed changes

liana-gui/src/loader.rs Outdated Show resolved Hide resolved

fix subscriptions: channel size and ContentLength error

178f818

edouardparis force-pushed the iced-v13 branch from 6e82c4c to 178f818 Compare February 4, 2025 09:41

jp1ac4 approved these changes Feb 4, 2025

View reviewed changes

edouardparis merged commit 3a4df7a into wizardsardine:master Feb 4, 2025
11 of 12 checks passed

edouardparis deleted the iced-v13 branch February 4, 2025 10:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

liana-gui: Iced v13 #1550

liana-gui: Iced v13 #1550

edouardparis commented Jan 21, 2025 •

edited

Loading

jp1ac4 commented Jan 31, 2025

pythcoiner Feb 3, 2025

jp1ac4 commented Feb 3, 2025

jp1ac4 commented Feb 3, 2025

pythcoiner commented Feb 3, 2025 •

edited

Loading

jp1ac4 commented Feb 3, 2025

pythcoiner commented Feb 3, 2025

pythcoiner Feb 3, 2025 •

edited

Loading

pythcoiner Feb 3, 2025

edouardparis Feb 3, 2025

pythcoiner Feb 4, 2025

edouardparis Feb 4, 2025

pythcoiner Feb 3, 2025

edouardparis Feb 4, 2025

jp1ac4 commented Feb 4, 2025

jp1ac4 left a comment

liana-gui: Iced v13 #1550

liana-gui: Iced v13 #1550

Conversation

edouardparis commented Jan 21, 2025 • edited Loading

jp1ac4 commented Jan 31, 2025

pythcoiner Feb 3, 2025

Choose a reason for hiding this comment

jp1ac4 commented Feb 3, 2025

jp1ac4 commented Feb 3, 2025

pythcoiner commented Feb 3, 2025 • edited Loading

jp1ac4 commented Feb 3, 2025

pythcoiner commented Feb 3, 2025

pythcoiner Feb 3, 2025 • edited Loading

Choose a reason for hiding this comment

pythcoiner Feb 3, 2025

Choose a reason for hiding this comment

edouardparis Feb 3, 2025

Choose a reason for hiding this comment

pythcoiner Feb 4, 2025

Choose a reason for hiding this comment

edouardparis Feb 4, 2025

Choose a reason for hiding this comment

pythcoiner Feb 3, 2025

Choose a reason for hiding this comment

edouardparis Feb 4, 2025

Choose a reason for hiding this comment

jp1ac4 commented Feb 4, 2025

jp1ac4 left a comment

Choose a reason for hiding this comment

edouardparis commented Jan 21, 2025 •

edited

Loading

pythcoiner commented Feb 3, 2025 •

edited

Loading

pythcoiner Feb 3, 2025 •

edited

Loading