diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java index aedb5ada39..9cbbe88919 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java @@ -30,12 +30,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.annotation.Nullable; +import java.util.Date; import java.util.Optional; public class TransactionsListItem { private final Logger log = LoggerFactory.getLogger(this.getClass()); - private String date; + private String dateString; + private final Date date; private final String txId; private final WalletService walletService; private final ConfidenceProgressIndicator progressIndicator; @@ -166,7 +168,8 @@ public class TransactionsListItem { details = received ? "Received funds" : "Withdrawn from wallet"; } - date = formatter.formatDateTime(transaction.getUpdateTime()); + date = transaction.getUpdateTime(); + dateString = formatter.formatDateTime(date); } @@ -203,8 +206,8 @@ public class TransactionsListItem { return progressIndicator; } - public final String getDate() { - return date; + public final String getDateString() { + return dateString; } @@ -241,6 +244,10 @@ public class TransactionsListItem { return detailsAvailable; } + public Date getDate() { + return date; + } + @Nullable public Tradable getTradable() { return tradable; diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java index 9015b79f59..a0238acfe7 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java @@ -311,7 +311,7 @@ public class TransactionsView extends ActivatableView { super.updateItem(item, empty); if (item != null && !empty) { - setText(item.getDate()); + setText(item.getDateString()); } else { setText(""); }