From bbbce964075bdf3bdf6c42f53d68941e2e07935a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 29 Sep 2017 14:30:02 -0700
Subject: [PATCH] Fix gray securityimage

---
 .../resources/qml/hifi/commerce/common/CommerceLightbox.qml  | 1 +
 .../qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml   | 1 +
 .../resources/qml/hifi/commerce/wallet/PassphraseModal.qml   | 1 +
 .../qml/hifi/commerce/wallet/SecurityImageSelection.qml      | 1 +
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml      | 1 +
 interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml | 5 +++--
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 0b236d4566..145b78bdc4 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -82,6 +82,7 @@ Rectangle {
             height: 140;
             fillMode: Image.PreserveAspectFit;
             mipmap: true;
+            cache: false;
         }
 
         RalewayRegular {
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 52e8c8fa42..125c2c756d 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -212,6 +212,7 @@ Item {
             anchors.bottomMargin: 16;
             width: height;
             mipmap: true;
+            cache: false;
 
             MouseArea {
                 enabled: securityImage.visible;
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
index 8ab0c3af60..5bd88ba790 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -129,6 +129,7 @@ Item {
             width: height;
             fillMode: Image.PreserveAspectFit;
             mipmap: true;
+            cache: false;
 
             MouseArea {
                 enabled: titleBarSecurityImage.visible;
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
index 706684ed39..e12332cd0c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
@@ -65,6 +65,7 @@ Item {
                     anchors.verticalCenter: parent.verticalCenter;
                     fillMode: Image.PreserveAspectFit;
                     mipmap: true;
+                    cache: false;
                 }
             }
             MouseArea {
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 251b747f83..480e7c921c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -140,6 +140,7 @@ Rectangle {
             anchors.bottomMargin: 6;
             width: height;
             mipmap: true;
+            cache: false;
 
             MouseArea {
                 enabled: titleBarSecurityImage.visible;
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index b90dc925a6..bc3ebb258e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -43,7 +43,7 @@ Item {
             if (!exists && root.lastPage === "step_2") {
                 // ERROR! Invalid security image.
                 root.activeView = "step_2";
-            } else {
+            } else if (exists) {
                 titleBarSecurityImage.source = "";
                 titleBarSecurityImage.source = "image://security/securityImage";
             }
@@ -116,7 +116,7 @@ Item {
         Image {
             id: titleBarSecurityImage;
             source: "";
-            visible: !securityImageTip.visible && titleBarSecurityImage.source !== "";
+            visible: !securityImageTip.visible && titleBarSecurityImage.source !== "" && root.activeView !== "step_1" && root.activeView !== "step_2";
             anchors.right: parent.right;
             anchors.rightMargin: 6;
             anchors.top: parent.top;
@@ -125,6 +125,7 @@ Item {
             anchors.bottomMargin: 6;
             width: height;
             mipmap: true;
+            cache: false;
 
             MouseArea {
                 enabled: titleBarSecurityImage.visible;