Merge pull request #3572

544cff7 TransactionHistory: add description to csv export (selsta)
57c2052 TransactionInfo: add isCoinbase and description (selsta)

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h
index ec632065..5501ae37 100644
--- a/src/libwalletqt/TransactionInfo.h
+++ b/src/libwalletqt/TransactionInfo.h
@@ -42,6 +42,7 @@ class TransactionInfo : public QObject
     Q_PROPERTY(Direction direction READ direction)
     Q_PROPERTY(bool isPending READ isPending)
     Q_PROPERTY(bool isFailed READ isFailed)
+    Q_PROPERTY(bool isCoinbase READ isCoinbase)
     Q_PROPERTY(double amount READ amount)
     Q_PROPERTY(quint64 atomicAmount READ atomicAmount)
     Q_PROPERTY(QString displayAmount READ displayAmount)
@@ -57,6 +58,7 @@ class TransactionInfo : public QObject
     Q_PROPERTY(QString date READ date)
     Q_PROPERTY(QString time READ time)
     Q_PROPERTY(QString paymentId READ paymentId)
+    Q_PROPERTY(QString description READ description)
     Q_PROPERTY(QString destinations_formatted READ destinations_formatted)
 
 public:
@@ -71,6 +73,7 @@ public:
     Direction  direction() const;
     bool isPending() const;
     bool isFailed() const;
+    bool isCoinbase() const;
     double amount() const;
     quint64 atomicAmount() const;
     QString displayAmount() const;
@@ -87,6 +90,7 @@ public:
     QString date() const;
     QString time() const;
     QString paymentId() const;
+    QString description() const;
     //! only applicable for output transactions
     //! used in tx details popup
     QString destinations_formatted() const;
@@ -104,7 +108,9 @@ private:
     QString m_hash;
     QString m_label;
     QString m_paymentId;
+    QString m_description;
     bool m_pending;
+    bool m_coinbase;
     quint32 m_subaddrAccount;
     QSet<quint32> m_subaddrIndex;
     QDateTime m_timestamp;