Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: console wallet timestamp display #4942

Merged
merged 5 commits into from
Nov 28, 2022
Merged

fix: console wallet timestamp display #4942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c8af62
renamed column `Local Date/Time` for pending and completed transactions,
agubarev Nov 22, 2022
a9e82be
Merge branch 'tari-project:development' into issue-4923-ui-tx-time
agubarev Nov 22, 2022
5ec2554
Merge branch 'development' into issue-4923-ui-tx-time
agubarev Nov 25, 2022
1d087bc
Merge branch 'development' into issue-4923-ui-tx-time
agubarev Nov 25, 2022
e20bca0
Merge branch 'development' into issue-4923-ui-tx-time
stringhandler Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 62 additions & 22 deletions applications/tari_console_wallet/src/ui/components/transactions_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,13 @@ impl TransactionsTab {
let mut column1_items = Vec::new();
let mut column2_items = Vec::new();
let mut column3_items = Vec::new();

for t in windowed_view.iter() {
let text_color = text_colors
.get(&t.cancelled.is_some())
.unwrap_or(&Color::Reset)
.to_owned();

if t.direction == TransactionDirection::Outbound {
column0_items.push(ListItem::new(Span::styled(
app_state.get_alias(&t.destination_address),
Expand All @@ -129,11 +131,19 @@ impl TransactionsTab {
let amount = format!("{}", t.amount);
column1_items.push(ListItem::new(Span::styled(amount, amount_style)));
}
let local_time = DateTime::<Local>::from_utc(t.timestamp, Local::now().offset().to_owned());

column2_items.push(ListItem::new(Span::styled(
format!("{}", local_time.format("%Y-%m-%d %H:%M:%S")),
match t.mined_timestamp {
None => String::new(),
Some(mined_timestamp) => format!(
"{}",
DateTime::<Local>::from_utc(mined_timestamp, Local::now().offset().to_owned())
.format("%Y-%m-%d %H:%M:%S")
),
},
Style::default().fg(text_color),
)));

column3_items.push(ListItem::new(Span::styled(
t.message.as_str(),
Style::default().fg(text_color),
Expand All @@ -146,8 +156,9 @@ impl TransactionsTab {
.max_width(MAX_WIDTH)
.add_column(Some("Source/Destination Public Key"), Some(67), column0_items)
.add_column(Some("Amount/Token"), Some(18), column1_items)
.add_column(Some("Local Date/Time"), Some(20), column2_items)
.add_column(Some("Mined At (Local)"), Some(20), column2_items)
.add_column(Some("Message"), None, column3_items);

column_list.render(f, area, &mut pending_list_state);
}

Expand Down Expand Up @@ -227,11 +238,19 @@ impl TransactionsTab {
let amount = format!("{}", t.amount);
column1_items.push(ListItem::new(Span::styled(amount, amount_style)));
}
let local_time = DateTime::<Local>::from_utc(t.timestamp, Local::now().offset().to_owned());

column2_items.push(ListItem::new(Span::styled(
format!("{}", local_time.format("%Y-%m-%d %H:%M:%S")),
match t.mined_timestamp {
None => String::new(),
Some(mined_timestamp) => format!(
"{}",
DateTime::<Local>::from_utc(mined_timestamp, Local::now().offset().to_owned())
.format("%Y-%m-%d %H:%M:%S")
),
},
Style::default().fg(text_color),
)));

let status = if matches!(t.cancelled, Some(TxCancellationReason::AbandonedCoinbase)) {
"Abandoned".to_string()
} else if matches!(t.cancelled, Some(TxCancellationReason::UserCancelled)) {
Expand All @@ -250,7 +269,7 @@ impl TransactionsTab {
.max_width(MAX_WIDTH)
.add_column(Some("Source/Destination Public Key"), Some(67), column0_items)
.add_column(Some("Amount/Token"), Some(18), column1_items)
.add_column(Some("Local Date/Time"), Some(20), column2_items)
.add_column(Some("Mined At (Local)"), Some(20), column2_items)
.add_column(Some("Status"), None, column3_items);

column_list.render(f, area, &mut completed_list_state);
Expand All @@ -272,7 +291,7 @@ impl TransactionsTab {
.split(area);

// Labels
let constraints = [Constraint::Length(1); 13];
let constraints = [Constraint::Length(1); 14];
let label_layout = Layout::default().constraints(constraints).split(columns[0]);

let tx_id = Span::styled("TxID:", Style::default().fg(Color::Magenta));
Expand All @@ -283,7 +302,8 @@ impl TransactionsTab {
let fee = Span::styled("Fee:", Style::default().fg(Color::Magenta));
let status = Span::styled("Status:", Style::default().fg(Color::Magenta));
let message = Span::styled("Message:", Style::default().fg(Color::Magenta));
let timestamp = Span::styled("Local Date/Time:", Style::default().fg(Color::Magenta));
let imported_timestamp = Span::styled("Imported At (Local):", Style::default().fg(Color::Magenta));
let mined_timestamp = Span::styled("Mined At (Local):", Style::default().fg(Color::Magenta));
let excess = Span::styled("Excess:", Style::default().fg(Color::Magenta));
let confirmations = Span::styled("Confirmations:", Style::default().fg(Color::Magenta));
let mined_height = Span::styled("Mined Height:", Style::default().fg(Color::Magenta));
Expand All @@ -306,21 +326,23 @@ impl TransactionsTab {
f.render_widget(paragraph, label_layout[6]);
let paragraph = Paragraph::new(message).wrap(trim);
f.render_widget(paragraph, label_layout[7]);
let paragraph = Paragraph::new(timestamp).wrap(trim);
let paragraph = Paragraph::new(mined_timestamp).wrap(trim);
f.render_widget(paragraph, label_layout[8]);
let paragraph = Paragraph::new(excess).wrap(trim);
let paragraph = Paragraph::new(imported_timestamp).wrap(trim);
f.render_widget(paragraph, label_layout[9]);
let paragraph = Paragraph::new(confirmations).wrap(trim);
let paragraph = Paragraph::new(excess).wrap(trim);
f.render_widget(paragraph, label_layout[10]);
let paragraph = Paragraph::new(mined_height).wrap(trim);
let paragraph = Paragraph::new(confirmations).wrap(trim);
f.render_widget(paragraph, label_layout[11]);
let paragraph = Paragraph::new(maturity).wrap(trim);
let paragraph = Paragraph::new(mined_height).wrap(trim);
f.render_widget(paragraph, label_layout[12]);
let paragraph = Paragraph::new(maturity).wrap(trim);
f.render_widget(paragraph, label_layout[13]);

// Content
let required_confirmations = app_state.get_required_confirmations();
if let Some(tx) = self.detailed_transaction.as_ref() {
let constraints = [Constraint::Length(1); 13];
let constraints = [Constraint::Length(1); 14];
let content_layout = Layout::default().constraints(constraints).split(columns[1]);
let tx_id = Span::styled(format!("{}", tx.tx_id), Style::default().fg(Color::White));

Expand Down Expand Up @@ -363,11 +385,27 @@ impl TransactionsTab {

let status = Span::styled(status_msg, Style::default().fg(Color::White));
let message = Span::styled(tx.message.as_str(), Style::default().fg(Color::White));
let local_time = DateTime::<Local>::from_utc(tx.timestamp, Local::now().offset().to_owned());
let timestamp = Span::styled(
format!("{}", local_time.format("%Y-%m-%d %H:%M:%S")),

// let mined_time = DateTime::<Local>::from_utc(tx.mined_timestamp, Local::now().offset().to_owned());
let mined_timestamp = Span::styled(
match tx.mined_timestamp {
None => String::new(),
Some(mined_timestamp) => format!(
"{}",
DateTime::<Local>::from_utc(mined_timestamp, Local::now().offset().to_owned())
.format("%Y-%m-%d %H:%M:%S")
),
},
// format!("{}", mined_time.format("%Y-%m-%d %H:%M:%S")),
Style::default().fg(Color::White),
);

let imported_time = DateTime::<Local>::from_utc(tx.timestamp, Local::now().offset().to_owned());
let imported_timestamp = Span::styled(
format!("{}", imported_time.format("%Y-%m-%d %H:%M:%S")),
Style::default().fg(Color::White),
);

let excess = Span::styled(tx.excess_signature.as_str(), Style::default().fg(Color::White));
let confirmation_count = app_state.get_confirmations(tx.tx_id);
let confirmations_msg = if tx.status == TransactionStatus::MinedConfirmed && tx.cancelled.is_none() {
Expand Down Expand Up @@ -411,16 +449,18 @@ impl TransactionsTab {
f.render_widget(paragraph, content_layout[6]);
let paragraph = Paragraph::new(message).wrap(trim);
f.render_widget(paragraph, content_layout[7]);
let paragraph = Paragraph::new(timestamp).wrap(trim);
let paragraph = Paragraph::new(mined_timestamp).wrap(trim);
f.render_widget(paragraph, content_layout[8]);
let paragraph = Paragraph::new(excess).wrap(trim);
let paragraph = Paragraph::new(imported_timestamp).wrap(trim);
f.render_widget(paragraph, content_layout[9]);
let paragraph = Paragraph::new(confirmations).wrap(trim);
let paragraph = Paragraph::new(excess).wrap(trim);
f.render_widget(paragraph, content_layout[10]);
let paragraph = Paragraph::new(mined_height).wrap(trim);
let paragraph = Paragraph::new(confirmations).wrap(trim);
f.render_widget(paragraph, content_layout[11]);
let paragraph = Paragraph::new(maturity).wrap(trim);
let paragraph = Paragraph::new(mined_height).wrap(trim);
f.render_widget(paragraph, content_layout[12]);
let paragraph = Paragraph::new(maturity).wrap(trim);
f.render_widget(paragraph, content_layout[13]);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions applications/tari_console_wallet/src/ui/state/app_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,7 @@ pub struct CompletedTransactionInfo {
pub status: TransactionStatus,
pub message: String,
pub timestamp: NaiveDateTime,
pub mined_timestamp: Option<NaiveDateTime>,
pub cancelled: Option<TxCancellationReason>,
pub direction: TransactionDirection,
pub mined_height: Option<u64>,
Expand Down Expand Up @@ -1042,6 +1043,7 @@ impl CompletedTransactionInfo {
status: tx.status,
message: tx.message,
timestamp: tx.timestamp,
mined_timestamp: tx.mined_timestamp,
cancelled: tx.cancelled,
direction: tx.direction,
mined_height: tx.mined_height,
Expand Down