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

Merge #1309: Reset hws watch list each step of the installer

Browse Source 
c2a8cf809267cb6f4dc11b9b16d8b03d7ef786e2 Reset hws watch list at each installer step (edouardparis)

Pull request description:

  Because of flaky connection, we drop the connection list to reconstruct it at each step of the installer

  close #1307

ACKs for top commit:
  edouardparis:
    ACK c2a8cf809267cb6f4dc11b9b16d8b03d7ef786e2

Tree-SHA512: 6b3bf655550c03a823d7b4e82cb8ee470f819d3b73453cfd132002761131fb01447c12ec93d6a28dad31ed464924514b98108b95a379e302aca969767373aa0e
This commit is contained in:
edouardparis 2024-09-09 18:24:03 +02:00
commit 51fef98b55
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/src/hw.rs
View File

@ -198,6 +198,10 @@ impl HardwareWallets {
self.aliases.insert(fg, new_alias);
}
pub fn reset_watch_list(&mut self) {
self.list = Vec::new();
}
pub fn load_aliases(&mut self, aliases: HashMap<Fingerprint, String>) {
self.aliases = aliases;
}

2
gui/src/installer/mod.rs
View File

@ -66,6 +66,7 @@ pub struct Installer {
impl Installer {
fn previous(&mut self) -> Command<Message> {
self.hws.reset_watch_list();
let network = self.network;
if self.current > 0 {
self.current -= 1;
@ -196,6 +197,7 @@ impl Installer {
}
fn next(&mut self) -> Command<Message> {
self.hws.reset_watch_list();
let current_step = self
.steps
.get_mut(self.current)