gui: add payment view
This commit is contained in:
parent
94e719975e
commit
ac97b27b96
@ -53,7 +53,7 @@ pub struct Home {
|
|||||||
number_of_expiring_coins: usize,
|
number_of_expiring_coins: usize,
|
||||||
pending_events: Vec<HistoryTransaction>,
|
pending_events: Vec<HistoryTransaction>,
|
||||||
events: Vec<HistoryTransaction>,
|
events: Vec<HistoryTransaction>,
|
||||||
selected_event: Option<usize>,
|
selected_event: Option<(usize, usize)>,
|
||||||
warning: Option<Error>,
|
warning: Option<Error>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -87,13 +87,13 @@ impl Home {
|
|||||||
|
|
||||||
impl State for Home {
|
impl State for Home {
|
||||||
fn view<'a>(&'a self, cache: &'a Cache) -> Element<'a, view::Message> {
|
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() {
|
let event = if i < self.pending_events.len() {
|
||||||
&self.pending_events[i]
|
&self.pending_events[i]
|
||||||
} else {
|
} else {
|
||||||
&self.events[i - self.pending_events.len()]
|
&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 {
|
} else {
|
||||||
view::dashboard(
|
view::dashboard(
|
||||||
&Menu::Home,
|
&Menu::Home,
|
||||||
@ -176,8 +176,8 @@ impl State for Home {
|
|||||||
Message::View(view::Message::Close) => {
|
Message::View(view::Message::Close) => {
|
||||||
self.selected_event = None;
|
self.selected_event = None;
|
||||||
}
|
}
|
||||||
Message::View(view::Message::Select(i)) => {
|
Message::View(view::Message::SelectSub(i, j)) => {
|
||||||
self.selected_event = Some(i);
|
self.selected_event = Some((i, j));
|
||||||
}
|
}
|
||||||
Message::View(view::Message::Next) => {
|
Message::View(view::Message::Next) => {
|
||||||
if let Some(last) = self.events.last() {
|
if let Some(last) = self.events.last() {
|
||||||
|
|||||||
@ -5,14 +5,19 @@ use iced::{alignment, Alignment, Length};
|
|||||||
use liana::miniscript::bitcoin;
|
use liana::miniscript::bitcoin;
|
||||||
use liana_ui::{
|
use liana_ui::{
|
||||||
color,
|
color,
|
||||||
component::{amount::*, event, text::*},
|
component::{amount::*, card, event, text::*},
|
||||||
icon, theme,
|
icon, theme,
|
||||||
util::Collection,
|
util::Collection,
|
||||||
widget::*,
|
widget::*,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
app::view::{coins, message::Message},
|
app::{
|
||||||
|
cache::Cache,
|
||||||
|
error::Error,
|
||||||
|
menu::Menu,
|
||||||
|
view::{coins, dashboard, message::Message},
|
||||||
|
},
|
||||||
daemon::model::HistoryTransaction,
|
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(
|
col.push(event::confirmed_incoming_event(
|
||||||
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
|
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
|
||||||
&Amount::from_sat(output.value),
|
&Amount::from_sat(output.value),
|
||||||
Message::Select(i),
|
Message::SelectSub(i, output_index),
|
||||||
))
|
))
|
||||||
} else {
|
} else {
|
||||||
col.push(event::unconfirmed_incoming_event(
|
col.push(event::unconfirmed_incoming_event(
|
||||||
&Amount::from_sat(output.value),
|
&Amount::from_sat(output.value),
|
||||||
Message::Select(i),
|
Message::SelectSub(i, output_index),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
} else if event.change_indexes.contains(&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(
|
col.push(event::confirmed_outgoing_event(
|
||||||
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
|
NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(),
|
||||||
&Amount::from_sat(output.value),
|
&Amount::from_sat(output.value),
|
||||||
Message::Select(i),
|
Message::SelectSub(i, output_index),
|
||||||
))
|
))
|
||||||
} else {
|
} else {
|
||||||
col.push(event::unconfirmed_outgoing_event(
|
col.push(event::unconfirmed_outgoing_event(
|
||||||
&Amount::from_sat(output.value),
|
&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),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ pub enum Message {
|
|||||||
Menu(Menu),
|
Menu(Menu),
|
||||||
Close,
|
Close,
|
||||||
Select(usize),
|
Select(usize),
|
||||||
|
SelectSub(usize, usize),
|
||||||
Settings(SettingsMessage),
|
Settings(SettingsMessage),
|
||||||
CreateSpend(CreateSpendMessage),
|
CreateSpend(CreateSpendMessage),
|
||||||
ImportSpend(ImportSpendMessage),
|
ImportSpend(ImportSpendMessage),
|
||||||
|
|||||||
@ -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> {
|
pub fn sidebar<'a>(menu: &Menu, cache: &'a Cache) -> Container<'a, Message> {
|
||||||
let home_button = if *menu == Menu::Home {
|
let home_button = if *menu == Menu::Home {
|
||||||
button::menu_active(Some(home_icon()), "Home")
|
button::menu_active(Some(home_icon()), "Home")
|
||||||
.on_press(Message::Reload)
|
.on_press(Message::Menu(Menu::Home))
|
||||||
.width(iced::Length::Fill)
|
.width(iced::Length::Fill)
|
||||||
} else {
|
} else {
|
||||||
button::menu(Some(home_icon()), "Home")
|
button::menu(Some(home_icon()), "Home")
|
||||||
|
|||||||
@ -81,7 +81,6 @@ pub fn transactions_view<'a>(
|
|||||||
.align_items(Alignment::Center)
|
.align_items(Alignment::Center)
|
||||||
.spacing(30),
|
.spacing(30),
|
||||||
)
|
)
|
||||||
.into()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
|
fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
|
||||||
@ -220,5 +219,4 @@ pub fn tx_view<'a>(
|
|||||||
))
|
))
|
||||||
.spacing(20),
|
.spacing(20),
|
||||||
)
|
)
|
||||||
.into()
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user