From 19945c5991425745be0355d953f6537248837dd3 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 2 Nov 2017 10:22:00 -0700
Subject: [PATCH] Update cert UI

---
 .../InspectionCertificate.qml                 | 31 ++++++++++++++-----
 .../ui/overlays/ContextOverlayInterface.cpp   |  4 +--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index bd8808f05f..6a7a181b92 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -33,6 +33,7 @@ Rectangle {
     property string dateOfPurchase: "--";
     property bool isLightbox: false;
     property bool isMyCert: false;
+    property bool isCertificateInvalid: false;
     // Style
     color: hifi.colors.faintGray;
     Hifi.QmlCommerce {
@@ -44,10 +45,11 @@ Rectangle {
             } else {
                 root.marketplaceUrl = result.data.marketplace_item_url;
                 root.isMyCert = result.isMyCert ? result.isMyCert : false;
-                root.itemOwner = root.isMyCert ? Account.username :
-                "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
-                root.itemEdition = result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run);
-                root.dateOfPurchase = getFormattedDate(result.data.transfer_created_at * 1000);
+                root.itemOwner = root.isCertificateInvalid ? "--" : (root.isMyCert ? Account.username :
+                "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022");
+                root.itemEdition = root.isCertificateInvalid ? "Uncertified Copy" :
+                (result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run));
+                root.dateOfPurchase = root.isCertificateInvalid ? "" : getFormattedDate(result.data.transfer_created_at * 1000);
                 root.itemName = result.data.marketplace_item_name;
 
                 if (result.data.invalid_reason || result.data.transfer_status[0] === "failed") {
@@ -70,20 +72,35 @@ Rectangle {
             if (certStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
                 // NOP
             } else if (certStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
+                root.isCertificateInvalid = true;
                 errorText.text = "Verification of this certificate timed out.";
                 errorText.color = hifi.colors.redHighlight;
             } else if (certStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
+                root.isCertificateInvalid = true;
                 titleBarText.text = "Invalid Certificate";
                 titleBarText.color = hifi.colors.redHighlight;
+
+                popText.text = "";
+                root.itemOwner = "";
+                dateOfPurchaseHeader.text = "";
+                root.dateOfPurchase = "";
                 root.itemEdition = "Uncertified Copy";
+
                 errorText.text = "The certificate associated with this entity is invalid.";
-                errorText.color = hifi.colors.redHighlight;
+                errorText.color = hifi.colors.baseGray;
             } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+                root.isCertificateInvalid = true;
                 titleBarText.text = "Invalid Certificate";
                 titleBarText.color = hifi.colors.redHighlight;
+
+                popText.text = "";
+                root.itemOwner = "";
+                dateOfPurchaseHeader.text = "";
+                root.dateOfPurchase = "";
                 root.itemEdition = "Uncertified Copy";
+
                 errorText.text = "The certificate associated with this entity is invalid.";
-                errorText.color = hifi.colors.redHighlight;
+                errorText.color = hifi.colors.baseGray;
             } else {
                 console.log("Unknown certificate status received from ledger signal!");
             }
@@ -239,7 +256,7 @@ Rectangle {
         }
         AnonymousProRegular {
             id: isMyCertText;
-            visible: root.isMyCert;
+            visible: root.isMyCert && !root.isCertificateInvalid;
             text: "(Private)";
             size: 18;
             // Anchors
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index f83427a1a1..b5af529f2b 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -304,9 +304,9 @@ void ContextOverlayInterface::openInspectionCertificate() {
                             if (!jsonObject["invalid_reason"].toString().isEmpty()) {
                                 qCDebug(entities) << "invalid_reason not empty";
                             } else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
-                                qCDebug(entities) << "'transfer_status' is 'failed'";;
+                                qCDebug(entities) << "'transfer_status' is 'failed'";
                             } else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
-                                qCDebug(entities) << "'transfer_status' is 'pending'";;
+                                qCDebug(entities) << "'transfer_status' is 'pending'";
                             } else {
                                 QString ownerKey = jsonObject["transfer_recipient_key"].toString();