From a2af50a9d0b7a82c7c993d1801b2c5ee0d797afe Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 6 Dec 2018 11:07:26 -0800
Subject: [PATCH] Show pre-auth'd transactions in Recent Activity before
 redemption

---
 .../qml/hifi/commerce/wallet/WalletHome.qml     |  8 ++++++--
 interface/src/commerce/Ledger.cpp               | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 4c8e1e6ca5..cf293a06df 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -270,9 +270,11 @@ Item {
                 model: transactionHistoryModel;
                 delegate: Item {
                     width: parent.width;
-                    height: (model.transaction_type === "pendingCount" && model.count !== 0) ? 40 : ((model.status === "confirmed" || model.status === "invalidated") ? transactionText.height + 30 : 0);
+                    height: (model.transaction_type === "pendingCount" && model.count !== 0) ? 40 :
+                        (transactionContainer.visible ? transactionText.height + 30 : 0);
 
                     Item {
+                        id: pendingCountContainer;
                         visible: model.transaction_type === "pendingCount" && model.count !== 0;
                         anchors.top: parent.top;
                         anchors.left: parent.left;
@@ -291,7 +293,9 @@ Item {
                     }
 
                     Item {
-                        visible: model.transaction_type !== "pendingCount" && (model.status === "confirmed" || model.status === "invalidated");
+                        id: transactionContainer;
+                        visible: model.transaction_type !== "pendingCount" &&
+                            (model.status === "confirmed" || model.status === "invalidated");
                         anchors.top: parent.top;
                         anchors.left: parent.left;
                         width: parent.width;
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 8bb01f6389..d72d896638 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -204,6 +204,7 @@ QString transactionString(const QJsonObject& valueObject) {
     int sentMoney = valueObject["sent_money"].toInt();
     int receivedMoney = valueObject["received_money"].toInt();
     int dateInteger = valueObject["created_at"].toInt();
+    QString transactionType = valueObject["transaction_type"].toString();
     QString message = valueObject["message"].toString();
     QDateTime createdAt(QDateTime::fromSecsSinceEpoch(dateInteger, Qt::UTC));
     QString result;
@@ -211,8 +212,12 @@ QString transactionString(const QJsonObject& valueObject) {
     if (sentCerts <= 0 && receivedCerts <= 0 && !KNOWN_USERS.contains(valueObject["sender_name"].toString())) {
         // this is an hfc transfer.
         if (sentMoney > 0) {
-            QString recipient = userLink(valueObject["recipient_name"].toString(), valueObject["place_name"].toString());
-            result += QString("Money sent to %1").arg(recipient);
+            if (transactionType == "escrow") {
+                result += QString("Money transferred to coupon");
+            } else {
+                QString recipient = userLink(valueObject["recipient_name"].toString(), valueObject["place_name"].toString());
+                result += QString("Money sent to %1").arg(recipient);
+            }
         } else {
             QString sender = userLink(valueObject["sender_name"].toString(), valueObject["place_name"].toString());
             result += QString("Money from %1").arg(sender);
@@ -227,8 +232,12 @@ QString transactionString(const QJsonObject& valueObject) {
         ) {
         // this is a non-HFC asset transfer.
         if (sentCerts > 0) {
-            QString recipient = userLink(valueObject["recipient_name"].toString(), valueObject["place_name"].toString());
-            result += QString("Gift sent to %1").arg(recipient);
+            if (transactionType == "escrow") {
+                result += QString("Item transferred to coupon");
+            } else {
+                QString recipient = userLink(valueObject["recipient_name"].toString(), valueObject["place_name"].toString());
+                result += QString("Gift sent to %1").arg(recipient);
+            }
         } else {
             QString sender = userLink(valueObject["sender_name"].toString(), valueObject["place_name"].toString());
             result += QString("Gift from %1").arg(sender);