Skip to content

Commit a39f5dd

Browse files
committed
Restart spend process according to current state
Spend process keeps its state if it is the first step. User can click on Clear to reset if he wants.
1 parent 5c64a16 commit a39f5dd

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

gui/src/app/state/spend/step.rs

+11
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,17 @@ impl Step for DefineSpend {
291291
self.batch_label.valid = label.len() <= 100;
292292
self.batch_label.value = label;
293293
}
294+
view::CreateSpendMessage::Clear => {
295+
self.recipients = vec![Recipient::default()];
296+
self.feerate.value = "".to_string();
297+
self.feerate.valid = true;
298+
for (_, selected) in &mut self.coins {
299+
*selected = false;
300+
}
301+
self.is_user_coin_selection = false;
302+
self.warning = None;
303+
return Command::none();
304+
}
294305
view::CreateSpendMessage::AddRecipient => {
295306
self.recipients.push(Recipient::default());
296307
}

gui/src/app/view/message.rs

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pub enum CreateSpendMessage {
3737
FeerateEdited(String),
3838
SelectPath(usize),
3939
Generate,
40+
Clear,
4041
}
4142

4243
#[derive(Debug, Clone)]

gui/src/app/view/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub fn sidebar<'a>(menu: &Menu, cache: &'a Cache) -> Container<'a, Message> {
9898
let spend_button = if *menu == Menu::CreateSpendTx {
9999
row!(
100100
button::menu_active(Some(send_icon()), "Send")
101-
.on_press(Message::Menu(Menu::CreateSpendTx))
101+
.on_press(Message::Reload)
102102
.width(iced::Length::Fill),
103103
menu_green_bar()
104104
)

gui/src/app/view/spend/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ pub fn create_spend_tx<'a>(
265265
.push(Space::with_width(Length::Fill))
266266
.push(
267267
button::primary(None, "Clear")
268-
.on_press(Message::Menu(Menu::CreateSpendTx))
268+
.on_press(Message::CreateSpend(CreateSpendMessage::Clear))
269269
.width(Length::Fixed(100.0)),
270270
)
271271
.push(

0 commit comments

Comments
 (0)