Skip to content
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.

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

Refactor/upgrade iced version #1865

Merged
merged 8 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
921 changes: 552 additions & 369 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ heck = "0.5"
hex = "0.4"
hex-literal = "0.4"
hmac = "0.12"
iced = "0.12"
iced_aw = "0.9"
iced = "0.13"
iced_aw = "0.11"
iced_fonts = "0.1"
indoc = "2.0"
itertools = "0.13"
jsonrpsee = { version = "0.22", default-features = false }
Expand Down Expand Up @@ -204,7 +205,7 @@ reedline = "0.32"
ref-cast = "1.0"
regex = "1.10"
replace_with = "0.1"
rfd = { version = "0.14", default-features = false }
rfd = { version = "0.15", default-features = false }
ripemd = "0.1"
rlimit = "0.10"
rstest = "0.23"
Expand Down
3 changes: 2 additions & 1 deletion node-gui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ anyhow.workspace = true
chrono.workspace = true
futures.workspace = true
iced = { workspace = true, features = ["canvas", "debug", "tokio", "lazy"] }
iced_aw = { workspace = true, features = ["cupertino", "icons"] }
iced_aw = { workspace = true }
iced_fonts = { workspace = true, features = ["bootstrap"] }
rfd = { workspace = true, features = ["xdg-portal", "tokio"] }
strum.workspace = true
thiserror.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion node-gui/backend/src/backend_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ impl Backend {
StoreSeedPhrase::Store,
Some(mnemonic.to_string()),
None,
import.skip_syncing(),
import.should_scan_blockchain(),
)
.await
.map_err(|err| BackendError::WalletError(err.to_string()))?;
Expand Down
7 changes: 4 additions & 3 deletions node-gui/backend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ mod wallet_events;

mod account_id;
pub use account_id::AccountId;
use wallet_types::scan_blockchain::ScanBlockchain;

use std::fmt::Debug;
use std::sync::Arc;
Expand Down Expand Up @@ -56,10 +57,10 @@ pub enum ImportOrCreate {
}

impl ImportOrCreate {
pub fn skip_syncing(&self) -> bool {
pub fn should_scan_blockchain(&self) -> ScanBlockchain {
match self {
Self::Create => true,
Self::Import => false,
Self::Create => ScanBlockchain::SkipScanning,
Self::Import => ScanBlockchain::ScanNoWait,
}
}
}
Expand Down
Loading