From 29b1673460fd2160e2e768c30f5e7f151f065b92 Mon Sep 17 00:00:00 2001 From: pythcoiner Date: Thu, 13 Mar 2025 11:40:35 +0100 Subject: [PATCH] fix user ACK + call import in settings/wallet --- liana-gui/src/app/state/settings/wallet.rs | 6 ++---- liana-gui/src/app/view/export.rs | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/liana-gui/src/app/state/settings/wallet.rs b/liana-gui/src/app/state/settings/wallet.rs index 8b52f650..6db4930d 100644 --- a/liana-gui/src/app/state/settings/wallet.rs +++ b/liana-gui/src/app/state/settings/wallet.rs @@ -262,10 +262,8 @@ impl State for WalletSettingsState { } Message::View(view::Message::Settings(view::SettingsMessage::ImportWallet)) => { if self.modal.is_none() { - let modal = ExportModal::new( - Some(daemon), - ImportExportType::Descriptor(self.wallet.main_descriptor.clone()), - ); + let modal = + ExportModal::new(Some(daemon), ImportExportType::ImportBackup(None, None)); let launch = modal.launch(false); self.modal = Modal::ImportExport(modal); launch diff --git a/liana-gui/src/app/view/export.rs b/liana-gui/src/app/view/export.rs index 6df0f689..16a57490 100644 --- a/liana-gui/src/app/view/export.rs +++ b/liana-gui/src/app/view/export.rs @@ -77,8 +77,8 @@ pub fn export_modal<'a, Message: From + Clone + 'a>( ), )), ); - let (msg, button) = match (error.is_none(), import_export_type) { - (true, ImportExportType::ImportBackup(labels, aliases)) => match (labels, aliases) { + let (msg, button) = match import_export_type { + ImportExportType::ImportBackup(labels, aliases) => match (labels, aliases) { (Some(_), _) => labels_btn, (_, Some(_)) => aliases_btn,