fix user ACK + call import in settings/wallet
This commit is contained in:
parent
2fe297879b
commit
29b1673460
@ -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
|
||||
|
||||
@ -77,8 +77,8 @@ pub fn export_modal<'a, Message: From<ImportExportMessage> + 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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user