nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #410: gui: add button to get next receive address

Browse Source 
e892a7a39f03642aec5cac6fe80a93c19eb03a41 gui: add button to get next receive address (jp1ac4)

Pull request description:

  This aims to resolve #114.

  I've added a "Next" button to the Receive screen, which gets a new address. I'm not sure if I've done this the right way and will be happy to make any changes as required.

  I compared several addresses against those returned by `bdk-cli` and they matched.

  Thank you.

ACKs for top commit:
  edouardparis:
    ACK e892a7a39f03642aec5cac6fe80a93c19eb03a41

Tree-SHA512: ad84d5cc41822c8100668fb2e4aa78eb0fbd4c97263b2e980dda17326240b5a730442537c36511214c5294f64398fabc5554e100bda264849b058f5ffee1f81e
This commit is contained in:
edouard 2023-04-13 10:01:19 +02:00
commit f0e5960688
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gui/src/app/state/mod.rs
View File

@ -278,21 +278,25 @@ impl State for ReceivePanel {
}
fn update(
&mut self,
_daemon: Arc<dyn Daemon + Sync + Send>,
daemon: Arc<dyn Daemon + Sync + Send>,
_cache: &Cache,
message: Message,
) -> Command<Message> {
if let Message::ReceiveAddress(res) = message {
match res {
Ok(address) => {
self.warning = None;
self.qr_code = Some(qr_code::State::new(address.to_qr_uri()).unwrap());
self.address = Some(address);
match message {
Message::ReceiveAddress(res) => {
match res {
Ok(address) => {
self.warning = None;
self.qr_code = Some(qr_code::State::new(address.to_qr_uri()).unwrap());
self.address = Some(address);
}
Err(e) => self.warning = Some(e),
}
Err(e) => self.warning = Some(e),
Command::none()
}
};
Command::none()
Message::View(view::Message::Next) => self.load(daemon),
_ => Command::none(),
}
}
fn load(&self, daemon: Arc<dyn Daemon + Sync + Send>) -> Command<Message> {

48
gui/src/app/view/receive.rs
View File

@ -1,12 +1,12 @@
use iced::{
widget::qr_code::{self, QRCode},
Alignment,
Alignment, Length,
};
use liana::miniscript::bitcoin;
use liana_ui::{
component::{card, text::*},
component::{button, card, text::*},
icon, theme,
widget::*,
};
@ -14,21 +14,31 @@ use liana_ui::{
use super::message::Message;
pub fn receive<'a>(address: &'a bitcoin::Address, qr: &'a qr_code::State) -> Element<'a, Message> {
card::simple(
Column::new()
.push(QRCode::new(qr).cell_size(10))
.push(
Row::new()
.push(text(address.to_string()).small())
.push(
Button::new(icon::clipboard_icon())
.on_press(Message::Clipboard(address.to_string()))
.style(theme::Button::TransparentBorder),
)
.align_items(Alignment::Center),
)
.align_items(Alignment::Center)
.spacing(20),
)
.into()
Column::new()
.push(card::simple(
Column::new()
.push(QRCode::new(qr).cell_size(10))
.push(
Row::new()
.push(text(address.to_string()).small())
.push(
Button::new(icon::clipboard_icon())
.on_press(Message::Clipboard(address.to_string()))
.style(theme::Button::TransparentBorder),
)
.align_items(Alignment::Center),
)
.align_items(Alignment::Center)
.spacing(20),
))
.push(
Column::new().push(
button::primary(None, "Generate new")
.on_press(Message::Next)
.width(Length::Units(150)),
),
)
.spacing(20)
.align_items(Alignment::Center)
.into()
}