From 12e982063e46757be747d8ee13156ad38bc6e170 Mon Sep 17 00:00:00 2001 From: edouardparis Date: Tue, 2 Apr 2024 16:03:28 +0200 Subject: [PATCH] fix use of deprecated method --- gui/src/app/state/settings/bitcoind.rs | 2 +- gui/src/app/view/home.rs | 8 ++++---- gui/src/app/view/transactions.rs | 6 +++--- gui/ui/src/component/event.rs | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gui/src/app/state/settings/bitcoind.rs b/gui/src/app/state/settings/bitcoind.rs index 83b13b9bd..a11c7768c 100644 --- a/gui/src/app/state/settings/bitcoind.rs +++ b/gui/src/app/state/settings/bitcoind.rs @@ -368,7 +368,7 @@ impl RescanSetting { u32::from_str(&self.day.value).unwrap_or(1), ) .and_then(|d| d.and_hms_opt(0, 0, 0)) - .map(|d| d.timestamp()) + .map(|d| d.and_utc().timestamp()) { match cache.network { Network::Bitcoin => { diff --git a/gui/src/app/view/home.rs b/gui/src/app/view/home.rs index 5b07ebf34..cc79cfcb6 100644 --- a/gui/src/app/view/home.rs +++ b/gui/src/app/view/home.rs @@ -1,4 +1,4 @@ -use chrono::NaiveDateTime; +use chrono::DateTime; use std::collections::HashMap; use iced::{alignment, widget::Space, Alignment, Length}; @@ -172,7 +172,7 @@ fn event_list_view(i: usize, event: &HistoryTransaction) -> Column<'_, Message> } else if let Some(t) = event.time { col.push(event::confirmed_incoming_event( label, - NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(), + DateTime::from_timestamp(t as i64, 0).unwrap(), &output.value, Message::SelectSub(i, output_index), )) @@ -188,7 +188,7 @@ fn event_list_view(i: usize, event: &HistoryTransaction) -> Column<'_, Message> } else if let Some(t) = event.time { col.push(event::confirmed_outgoing_event( label, - NaiveDateTime::from_timestamp_opt(t as i64, 0).unwrap(), + DateTime::from_timestamp(t as i64, 0).unwrap(), &output.value, Message::SelectSub(i, output_index), )) @@ -286,7 +286,7 @@ pub fn payment_view<'a>( .push(card::simple( Column::new() .push_maybe(tx.time.map(|t| { - let date = NaiveDateTime::from_timestamp_opt(t as i64, 0) + let date = DateTime::from_timestamp(t as i64, 0) .unwrap() .format("%b. %d, %Y - %T"); Row::new() diff --git a/gui/src/app/view/transactions.rs b/gui/src/app/view/transactions.rs index bacbf4e9d..0bec1cdba 100644 --- a/gui/src/app/view/transactions.rs +++ b/gui/src/app/view/transactions.rs @@ -1,4 +1,4 @@ -use chrono::NaiveDateTime; +use chrono::DateTime; use std::collections::{HashMap, HashSet}; use iced::{alignment, widget::tooltip, Alignment, Length}; @@ -107,7 +107,7 @@ fn tx_list_view(i: usize, tx: &HistoryTransaction) -> Element<'_, Message> { Container::new( text(format!( "{}", - NaiveDateTime::from_timestamp_opt(t as i64, 0) + DateTime::from_timestamp(t as i64, 0) .unwrap() .format("%b. %d, %Y - %T"), )) @@ -374,7 +374,7 @@ pub fn tx_view<'a>( .push(card::simple( Column::new() .push_maybe(tx.time.map(|t| { - let date = NaiveDateTime::from_timestamp_opt(t as i64, 0) + let date = DateTime::from_timestamp(t as i64, 0) .unwrap() .format("%b. %d, %Y - %T"); Row::new() diff --git a/gui/ui/src/component/event.rs b/gui/ui/src/component/event.rs index 1ee629954..631fa9429 100644 --- a/gui/ui/src/component/event.rs +++ b/gui/ui/src/component/event.rs @@ -39,7 +39,7 @@ pub fn unconfirmed_outgoing_event<'a, T: Clone + 'a>( pub fn confirmed_outgoing_event<'a, T: Clone + 'a>( label: Option>, - date: chrono::NaiveDateTime, + date: chrono::DateTime, amount: &Amount, msg: T, ) -> Container<'a, T> { @@ -99,7 +99,7 @@ pub fn unconfirmed_incoming_event<'a, T: Clone + 'a>( pub fn confirmed_incoming_event<'a, T: Clone + 'a>( label: Option>, - date: chrono::NaiveDateTime, + date: chrono::DateTime, amount: &Amount, msg: T, ) -> Container<'a, T> {