diff --git a/gui/src/app/state/spend/mod.rs b/gui/src/app/state/spend/mod.rs index 6c4418e3..a8c4d607 100644 --- a/gui/src/app/state/spend/mod.rs +++ b/gui/src/app/state/spend/mod.rs @@ -144,10 +144,10 @@ impl State for CreateSpendPanel { } } - if matches!(message, Message::View(view::Message::Previous)) { - if self.steps.get(self.current - 1).is_some() { - self.current -= 1; - } + if matches!(message, Message::View(view::Message::Previous)) + && self.steps.get(self.current - 1).is_some() + { + self.current -= 1; } if let Some(step) = self.steps.get_mut(self.current) { diff --git a/gui/src/app/state/spend/step.rs b/gui/src/app/state/spend/step.rs index b70f1d7b..0467cbef 100644 --- a/gui/src/app/state/spend/step.rs +++ b/gui/src/app/state/spend/step.rs @@ -60,8 +60,8 @@ impl Step for ChooseRecipients { _draft: &TransactionDraft, message: Message, ) -> Command { - match message { - Message::View(view::Message::CreateSpend(msg)) => match &msg { + if let Message::View(view::Message::CreateSpend(msg)) = message { + match &msg { view::CreateSpendMessage::AddRecipient => { self.recipients.push(Recipient::default()); } @@ -72,8 +72,7 @@ impl Step for ChooseRecipients { self.recipients.get_mut(*i).unwrap().update(msg); } _ => {} - }, - _ => {} + } } Command::none() } diff --git a/gui/src/app/view/spend/detail.rs b/gui/src/app/view/spend/detail.rs index 938468ad..5fdf2e49 100644 --- a/gui/src/app/view/spend/detail.rs +++ b/gui/src/app/view/spend/detail.rs @@ -37,7 +37,6 @@ pub fn spend_view<'a, T: Into>>( .push(spend_overview_view(tx)) .push(action), ) - .into() } pub fn save_action<'a>(saved: bool) -> Element<'a, Message> { diff --git a/gui/src/app/view/spend/step.rs b/gui/src/app/view/spend/step.rs index 8e5e56d9..e59b7f6d 100644 --- a/gui/src/app/view/spend/step.rs +++ b/gui/src/app/view/spend/step.rs @@ -21,10 +21,10 @@ use crate::{ }, }; -pub fn choose_recipients_view<'a>( - recipients: Vec>, +pub fn choose_recipients_view( + recipients: Vec>, is_valid: bool, -) -> Element<'a, Message> { +) -> Element { modal( false, None, diff --git a/gui/src/daemon/embedded.rs b/gui/src/daemon/embedded.rs index 5587372e..d60ef1be 100644 --- a/gui/src/daemon/embedded.rs +++ b/gui/src/daemon/embedded.rs @@ -136,14 +136,14 @@ impl Daemon for EmbeddedDaemon { } fn delete_spend_tx(&self, txid: &Txid) -> Result<(), DaemonError> { - Ok(self - .handle + self.handle .as_ref() .ok_or(DaemonError::NoAnswer)? .lock() .unwrap() .control - .delete_spend(txid)) + .delete_spend(txid); + Ok(()) } fn broadcast_spend_tx(&self, txid: &Txid) -> Result<(), DaemonError> { diff --git a/gui/src/daemon/mod.rs b/gui/src/daemon/mod.rs index 233608ac..62267e4a 100644 --- a/gui/src/daemon/mod.rs +++ b/gui/src/daemon/mod.rs @@ -71,7 +71,7 @@ pub trait Daemon: Debug { .iter() .any(|input| input.previous_output == coin.outpoint) }) - .map(|c| c.clone()) + .copied() .collect(); model::SpendTx::new(tx.psbt, tx.change_index.map(|i| i as usize), coins) })