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

gui: add payment view

Browse Source
This commit is contained in:
edouard 2023-04-26 14:54:51 +02:00
parent 94e719975e
commit ac97b27b96
5 changed files with 96 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ pub struct Home {
number_of_expiring_coins: usize,
pending_events: Vec<HistoryTransaction>,
events: Vec<HistoryTransaction>,
selected_event: Option<usize>,
selected_event: Option<(usize, usize)>,
warning: Option<Error>,
}
@ -87,13 +87,13 @@ impl Home {
impl State for Home {
fn view<'a>(&'a self, cache: &'a Cache) -> Element<'a, view::Message> {
if let Some(i) = self.selected_event {
if let Some((i, output_index)) = self.selected_event {
let event = if i < self.pending_events.len() {
&self.pending_events[i]
} else {
&self.events[i - self.pending_events.len()]
};
view::transactions::tx_view(cache, event, self.warning.as_ref())
view::home::payment_view(cache, event, output_index, self.warning.as_ref())
} else {
view::dashboard(
&Menu::Home,
@ -176,8 +176,8 @@ impl State for Home {
Message::View(view::Message::Close) => {
self.selected_event = None;
}
Message::View(view::Message::Select(i)) => {
self.selected_event = Some(i);
Message::View(view::Message::SelectSub(i, j)) => {
self.selected_event = Some((i, j));
}
Message::View(view::Message::Next) => {
if let Some(last) = self.events.last() {

95
gui/src/app/view/home.rs
View File

@ -5,14 +5,19 @@ use iced::{alignment, Alignment, Length};
use liana::miniscript::bitcoin;
use liana_ui::{
color,
component::{amount::*, event, text::*},
component::{amount::*, card, event, text::*},
icon, theme,
util::Collection,
widget::*,
};
use crate::{
app::view::{coins, message::Message},
app::{
cache::Cache,
error::Error,
menu::Menu,
view::{coins, dashboard, message::Message},
},
daemon::model::HistoryTransaction,
};
@ -143,12 +148,12 @@ fn event_list_view<'a>(i: usize, event: &HistoryTransaction) -> Column<'a, Messa
col.push(event::confirmed_incoming_event(
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
&Amount::from_sat(output.value),
Message::Select(i),
Message::SelectSub(i, output_index),
))
} else {
col.push(event::unconfirmed_incoming_event(
&Amount::from_sat(output.value),
Message::Select(i),
Message::SelectSub(i, output_index),
))
}
} else if event.change_indexes.contains(&output_index) {
@ -157,14 +162,92 @@ fn event_list_view<'a>(i: usize, event: &HistoryTransaction) -> Column<'a, Messa
col.push(event::confirmed_outgoing_event(
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
&Amount::from_sat(output.value),
Message::Select(i),
Message::SelectSub(i, output_index),
))
} else {
col.push(event::unconfirmed_outgoing_event(
&Amount::from_sat(output.value),
Message::Select(i),
Message::SelectSub(i, output_index),
))
}
},
)
}
pub fn payment_view<'a>(
cache: &'a Cache,
tx: &'a HistoryTransaction,
output_index: usize,
warning: Option<&'a Error>,
) -> Element<'a, Message> {
dashboard(
&Menu::Home,
cache,
warning,
Column::new()
.push(if tx.is_self_send() {
Container::new(h3("Payment")).width(Length::Fill)
} else if tx.is_external() {
Container::new(h3("Incoming payment")).width(Length::Fill)
} else {
Container::new(h3("Outgoing payment")).width(Length::Fill)
})
.push(Container::new(amount_with_size(
&Amount::from_sat(tx.tx.output[output_index].value),
H1_SIZE,
)))
.push(Container::new(h3("Transaction")).width(Length::Fill))
.push_maybe(tx.fee_amount.map(|fee_amount| {
Row::new()
.align_items(Alignment::Center)
.push(h3("Miner fee: ").style(color::GREY_3))
.push(amount_with_size(&fee_amount, H3_SIZE))
}))
.push(card::simple(
Column::new()
.push_maybe(tx.time.map(|t| {
let date = NaiveDateTime::from_timestamp_opt(t as i64, 0)
.unwrap()
.format("%b. %d, %Y - %T");
Row::new()
.width(Length::Fill)
.push(Container::new(text("Date:").bold()).width(Length::Fill))
.push(Container::new(text(format!("{}", date))).width(Length::Shrink))
}))
.push(
Row::new()
.width(Length::Fill)
.align_items(Alignment::Center)
.push(Container::new(text("Txid:").bold()).width(Length::Fill))
.push(
Row::new()
.align_items(Alignment::Center)
.push(Container::new(text(format!("{}", tx.tx.txid())).small()))
.push(
Button::new(icon::clipboard_icon())
.on_press(Message::Clipboard(tx.tx.txid().to_string()))
.style(theme::Button::TransparentBorder),
)
.width(Length::Shrink),
),
)
.spacing(5),
))
.push(super::psbt::inputs_and_outputs_view(
&tx.coins,
&tx.tx,
cache.network,
if tx.is_external() {
None
} else {
Some(tx.change_indexes.clone())
},
if tx.is_external() {
Some(tx.change_indexes.clone())
} else {
None
},
))
.spacing(20),
)
}

1
gui/src/app/view/message.rs
View File

@ -8,6 +8,7 @@ pub enum Message {
Menu(Menu),
Close,
Select(usize),
SelectSub(usize, usize),
Settings(SettingsMessage),
CreateSpend(CreateSpendMessage),
ImportSpend(ImportSpendMessage),

2
gui/src/app/view/mod.rs
View File

@ -34,7 +34,7 @@ use crate::app::{cache::Cache, error::Error, menu::Menu};
pub fn sidebar<'a>(menu: &Menu, cache: &'a Cache) -> Container<'a, Message> {
let home_button = if *menu == Menu::Home {
button::menu_active(Some(home_icon()), "Home")
.on_press(Message::Reload)
.on_press(Message::Menu(Menu::Home))
.width(iced::Length::Fill)
} else {
button::menu(Some(home_icon()), "Home")

2
gui/src/app/view/transactions.rs
View File

@ -81,7 +81,6 @@ pub fn transactions_view<'a>(
.align_items(Alignment::Center)
.spacing(30),
)
.into()
}
fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
@ -220,5 +219,4 @@ pub fn tx_view<'a>(
))
.spacing(20),
)
.into()
}