gui: remove transaction view in modal
This commit is contained in:
edouard
parent
14b1434374
commit
94e719975e
@ -93,26 +93,22 @@ impl State for Home {
|
||||
} else {
|
||||
&self.events[i - self.pending_events.len()]
|
||||
};
|
||||
return view::modal(
|
||||
false,
|
||||
self.warning.as_ref(),
|
||||
view::transactions::tx_view(cache, event),
|
||||
None::<Element<view::Message>>,
|
||||
);
|
||||
view::transactions::tx_view(cache, event, self.warning.as_ref())
|
||||
} else {
|
||||
view::dashboard(
|
||||
&Menu::Home,
|
||||
cache,
|
||||
None,
|
||||
view::home::home_view(
|
||||
&self.balance,
|
||||
&self.unconfirmed_balance,
|
||||
&self.remaining_sequence,
|
||||
self.number_of_expiring_coins,
|
||||
&self.pending_events,
|
||||
&self.events,
|
||||
),
|
||||
)
|
||||
}
|
||||
view::dashboard(
|
||||
&Menu::Home,
|
||||
cache,
|
||||
None,
|
||||
view::home::home_view(
|
||||
&self.balance,
|
||||
&self.unconfirmed_balance,
|
||||
&self.remaining_sequence,
|
||||
self.number_of_expiring_coins,
|
||||
&self.pending_events,
|
||||
&self.events,
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
fn update(
|
||||
|
||||
@ -5,7 +5,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
|
||||
use iced::Command;
|
||||
use liana_ui::widget::*;
|
||||
|
||||
use crate::app::{cache::Cache, error::Error, menu::Menu, message::Message, view, State};
|
||||
use crate::app::{cache::Cache, error::Error, message::Message, view, State};
|
||||
|
||||
use crate::daemon::{model::HistoryTransaction, Daemon};
|
||||
|
||||
@ -36,19 +36,15 @@ impl State for TransactionsPanel {
|
||||
} else {
|
||||
&self.txs[i - self.pending_txs.len()]
|
||||
};
|
||||
return view::modal(
|
||||
false,
|
||||
view::transactions::tx_view(cache, tx, self.warning.as_ref())
|
||||
} else {
|
||||
view::transactions::transactions_view(
|
||||
cache,
|
||||
&self.pending_txs,
|
||||
&self.txs,
|
||||
self.warning.as_ref(),
|
||||
view::transactions::tx_view(cache, tx),
|
||||
None::<Element<view::Message>>,
|
||||
);
|
||||
)
|
||||
}
|
||||
view::dashboard(
|
||||
&Menu::Transactions,
|
||||
cache,
|
||||
None,
|
||||
view::transactions::transactions_view(&self.pending_txs, &self.txs),
|
||||
)
|
||||
}
|
||||
|
||||
fn update(
|
||||
|
||||
@ -53,7 +53,7 @@ pub fn sidebar<'a>(menu: &Menu, cache: &'a Cache) -> Container<'a, Message> {
|
||||
.align_items(iced::Alignment::Center),
|
||||
)
|
||||
.style(theme::Button::Menu(true))
|
||||
.on_press(Message::Reload)
|
||||
.on_press(Message::Menu(Menu::Transactions))
|
||||
.width(iced::Length::Fill)
|
||||
} else {
|
||||
Button::new(
|
||||
|
||||
@ -3,6 +3,7 @@ use chrono::NaiveDateTime;
|
||||
use iced::{alignment, Alignment, Length};
|
||||
|
||||
use liana_ui::{
|
||||
color,
|
||||
component::{amount::*, badge, card, text::*},
|
||||
icon, theme,
|
||||
util::Collection,
|
||||
@ -10,65 +11,77 @@ use liana_ui::{
|
||||
};
|
||||
|
||||
use crate::{
|
||||
app::{cache::Cache, view::message::Message},
|
||||
app::{
|
||||
cache::Cache,
|
||||
error::Error,
|
||||
menu::Menu,
|
||||
view::{dashboard, message::Message},
|
||||
},
|
||||
daemon::model::HistoryTransaction,
|
||||
};
|
||||
|
||||
pub const HISTORY_EVENT_PAGE_SIZE: u64 = 20;
|
||||
|
||||
pub fn transactions_view<'a>(
|
||||
cache: &'a Cache,
|
||||
pending_txs: &[HistoryTransaction],
|
||||
txs: &Vec<HistoryTransaction>,
|
||||
warning: Option<&'a Error>,
|
||||
) -> Element<'a, Message> {
|
||||
Column::new()
|
||||
.push(Container::new(h3("Transactions")).width(Length::Fill))
|
||||
.push(
|
||||
Column::new()
|
||||
.spacing(10)
|
||||
.push_maybe(if !pending_txs.is_empty() {
|
||||
Some(
|
||||
pending_txs
|
||||
.iter()
|
||||
.enumerate()
|
||||
.fold(Column::new().spacing(10), |col, (i, tx)| {
|
||||
col.push(tx_list_view(i, tx))
|
||||
}),
|
||||
)
|
||||
} else {
|
||||
None
|
||||
})
|
||||
.push(
|
||||
txs.iter()
|
||||
.enumerate()
|
||||
.fold(Column::new().spacing(10), |col, (i, tx)| {
|
||||
col.push(tx_list_view(i + pending_txs.len(), tx))
|
||||
}),
|
||||
)
|
||||
.push_maybe(
|
||||
if txs.len() % HISTORY_EVENT_PAGE_SIZE as usize == 0 && !txs.is_empty() {
|
||||
dashboard(
|
||||
&Menu::Transactions,
|
||||
cache,
|
||||
warning,
|
||||
Column::new()
|
||||
.push(Container::new(h3("Transactions")).width(Length::Fill))
|
||||
.push(
|
||||
Column::new()
|
||||
.spacing(10)
|
||||
.push_maybe(if !pending_txs.is_empty() {
|
||||
Some(
|
||||
Container::new(
|
||||
Button::new(
|
||||
text("See more")
|
||||
.width(Length::Fill)
|
||||
.horizontal_alignment(alignment::Horizontal::Center),
|
||||
)
|
||||
.width(Length::Fill)
|
||||
.padding(15)
|
||||
.style(theme::Button::TransparentBorder)
|
||||
.on_press(Message::Next),
|
||||
)
|
||||
.width(Length::Fill)
|
||||
.style(theme::Container::Card(theme::Card::Simple)),
|
||||
pending_txs
|
||||
.iter()
|
||||
.enumerate()
|
||||
.fold(Column::new().spacing(10), |col, (i, tx)| {
|
||||
col.push(tx_list_view(i, tx))
|
||||
}),
|
||||
)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
),
|
||||
)
|
||||
.align_items(Alignment::Center)
|
||||
.spacing(30)
|
||||
.into()
|
||||
})
|
||||
.push(
|
||||
txs.iter()
|
||||
.enumerate()
|
||||
.fold(Column::new().spacing(10), |col, (i, tx)| {
|
||||
col.push(tx_list_view(i + pending_txs.len(), tx))
|
||||
}),
|
||||
)
|
||||
.push_maybe(
|
||||
if txs.len() % HISTORY_EVENT_PAGE_SIZE as usize == 0 && !txs.is_empty() {
|
||||
Some(
|
||||
Container::new(
|
||||
Button::new(
|
||||
text("See more")
|
||||
.width(Length::Fill)
|
||||
.horizontal_alignment(alignment::Horizontal::Center),
|
||||
)
|
||||
.width(Length::Fill)
|
||||
.padding(15)
|
||||
.style(theme::Button::TransparentBorder)
|
||||
.on_press(Message::Next),
|
||||
)
|
||||
.width(Length::Fill)
|
||||
.style(theme::Container::Card(theme::Card::Simple)),
|
||||
)
|
||||
} else {
|
||||
None
|
||||
},
|
||||
),
|
||||
)
|
||||
.align_items(Alignment::Center)
|
||||
.spacing(30),
|
||||
)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
|
||||
@ -125,74 +138,87 @@ fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
|
||||
.into()
|
||||
}
|
||||
|
||||
pub fn tx_view<'a>(cache: &Cache, tx: &'a HistoryTransaction) -> Element<'a, Message> {
|
||||
Column::new()
|
||||
.push(
|
||||
Row::new()
|
||||
.push(if tx.is_external() {
|
||||
badge::receive()
|
||||
} else {
|
||||
badge::spend()
|
||||
})
|
||||
.spacing(10)
|
||||
.align_items(Alignment::Center),
|
||||
)
|
||||
.push(if tx.is_external() {
|
||||
amount_with_size(&tx.incoming_amount, 50)
|
||||
} else {
|
||||
amount_with_size(&tx.outgoing_amount, 50)
|
||||
})
|
||||
.push_maybe(
|
||||
tx.fee_amount
|
||||
.map(|fee| Row::new().push(text("Miner Fee: ")).push(amount(&fee))),
|
||||
)
|
||||
.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(
|
||||
pub fn tx_view<'a>(
|
||||
cache: &'a Cache,
|
||||
tx: &'a HistoryTransaction,
|
||||
warning: Option<&'a Error>,
|
||||
) -> Element<'a, Message> {
|
||||
dashboard(
|
||||
&Menu::Transactions,
|
||||
cache,
|
||||
warning,
|
||||
Column::new()
|
||||
.push(if tx.is_self_send() {
|
||||
Container::new(h3("Transaction")).width(Length::Fill)
|
||||
} else if tx.is_external() {
|
||||
Container::new(h3("Incoming transaction")).width(Length::Fill)
|
||||
} else {
|
||||
Container::new(h3("Outgoing transaction")).width(Length::Fill)
|
||||
})
|
||||
.push(
|
||||
Column::new().spacing(20).push(
|
||||
Column::new()
|
||||
.push(if tx.is_self_send() {
|
||||
Container::new(h1("Self send"))
|
||||
} else if tx.is_external() {
|
||||
Container::new(amount_with_size(&tx.incoming_amount, H1_SIZE))
|
||||
} else {
|
||||
Container::new(amount_with_size(&tx.outgoing_amount, H1_SIZE))
|
||||
})
|
||||
.push_maybe(tx.fee_amount.map(|fee_amount| {
|
||||
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
|
||||
},
|
||||
))
|
||||
.align_items(Alignment::Center)
|
||||
.spacing(20)
|
||||
.max_width(800)
|
||||
.into()
|
||||
.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),
|
||||
)
|
||||
.into()
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user