From 9a4b665fa1a471a7a6c7e0dea09065f9f01ec35d Mon Sep 17 00:00:00 2001
From: edouardparis <m@edouard.paris>
Date: Mon, 30 Oct 2023 18:42:34 +0100
Subject: [PATCH] fix wallet name in settings during install

---
 gui/src/app/wallet.rs        |  2 +-
 gui/src/installer/context.rs | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gui/src/app/wallet.rs b/gui/src/app/wallet.rs
index 105441ad..e9cd483d 100644
--- a/gui/src/app/wallet.rs
+++ b/gui/src/app/wallet.rs
@@ -12,7 +12,7 @@ use liana::{miniscript::bitcoin, signer::HotSigner};
 use liana::descriptors::LianaDescriptor;
 use liana::miniscript::bitcoin::bip32::Fingerprint;
 
-pub const DEFAULT_WALLET_NAME: &str = "Liana";
+const DEFAULT_WALLET_NAME: &str = "Liana";
 
 pub fn wallet_name(main_descriptor: &LianaDescriptor) -> String {
     let desc = main_descriptor.to_string();
diff --git a/gui/src/installer/context.rs b/gui/src/installer/context.rs
index 3409ad9c..7acf49d3 100644
--- a/gui/src/installer/context.rs
+++ b/gui/src/installer/context.rs
@@ -5,7 +5,7 @@ use std::time::Duration;
 use crate::{
     app::{
         settings::{KeySetting, Settings, WalletSetting},
-        wallet::DEFAULT_WALLET_NAME,
+        wallet::wallet_name,
     },
     bitcoind::Bitcoind,
     hw::HardwareWalletConfig,
@@ -68,13 +68,14 @@ impl Context {
                     .map(|token| HardwareWalletConfig::new(kind, *fingerprint, token))
             })
             .collect();
+        let descriptor = self
+            .descriptor
+            .as_ref()
+            .expect("Must be a descriptor at this point");
         Settings {
             wallets: vec![WalletSetting {
-                name: DEFAULT_WALLET_NAME.to_string(),
-                descriptor_checksum: self
-                    .descriptor
-                    .as_ref()
-                    .unwrap()
+                name: wallet_name(descriptor),
+                descriptor_checksum: descriptor
                     .to_string()
                     .split_once('#')
                     .map(|(_, checksum)| checksum)