From dbc7ff265a7f12e7fb89be4fe5815e7f16810da7 Mon Sep 17 00:00:00 2001 From: woodser Date: Wed, 31 Aug 2022 13:12:02 -0400 Subject: [PATCH] show wallet transaction dates --- core/src/main/java/bisq/core/offer/OpenOfferManager.java | 1 - core/src/main/java/bisq/core/trade/TradeManager.java | 1 - .../desktop/main/funds/transactions/TransactionsListItem.java | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/bisq/core/offer/OpenOfferManager.java index 7133a1ba..aea9af69 100644 --- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java +++ b/core/src/main/java/bisq/core/offer/OpenOfferManager.java @@ -33,7 +33,6 @@ import bisq.core.offer.placeoffer.PlaceOfferProtocol; import bisq.core.provider.price.PriceFeedService; import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator; import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager; -import bisq.core.support.dispute.mediation.mediator.Mediator; import bisq.core.support.dispute.mediation.mediator.MediatorManager; import bisq.core.trade.ClosedTradableManager; import bisq.core.trade.TradableList; diff --git a/core/src/main/java/bisq/core/trade/TradeManager.java b/core/src/main/java/bisq/core/trade/TradeManager.java index 41773777..e9f7d2a3 100644 --- a/core/src/main/java/bisq/core/trade/TradeManager.java +++ b/core/src/main/java/bisq/core/trade/TradeManager.java @@ -66,7 +66,6 @@ import bisq.network.p2p.P2PService; import bisq.network.p2p.network.TorNetworkNode; import com.google.common.collect.ImmutableList; import bisq.common.ClockWatcher; -import bisq.common.UserThread; import bisq.common.config.Config; import bisq.common.crypto.KeyRing; import bisq.common.handlers.ErrorMessageHandler; diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java index 33d74992..58c29bdc 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java +++ b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java @@ -174,7 +174,9 @@ class TransactionsListItem { } } - this.date = new Date(0); // TODO: convert height to date + // get tx date/time + Long timestamp = tx.getBlock() == null ? System.currentTimeMillis() : tx.getBlock().getTimestamp() * 1000l; + this.date = new Date(timestamp); dateString = DisplayUtils.formatDateTime(date); isDustAttackTx = received && valueSentToMe.value < ignoreDustThreshold;