From 94e1c425ab618bf8b8105214d7928c38e029c527 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 24 Jan 2018 17:03:16 -0800
Subject: [PATCH] Fix MacOS Security Pic visibility; fix incorrect button state
 when changing pic

---
 .../resources/qml/hifi/commerce/wallet/Security.qml |  2 +-
 .../hifi/commerce/wallet/SecurityImageChange.qml    | 13 ++-----------
 .../hifi/commerce/wallet/SecurityImageSelection.qml |  3 ++-
 interface/src/commerce/Wallet.cpp                   |  4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml
index d825196655..634a68d117 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Security.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml
@@ -193,7 +193,7 @@ Item {
                 color: hifi.colors.white;
             }
 
-            // "Change Passphrase" button
+            // "Change Security Pic" button
             HifiControlsUit.Button {
                 id: changeSecurityImageButton;
                 color: hifi.buttons.blue;
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
index 2ad2b75553..86a4220b74 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
@@ -34,13 +34,11 @@ Item {
             securityImageChangePageSecurityImage.source = "image://security/securityImage";
             if (exists) { // Success submitting new security image
                 if (root.justSubmitted) {
-                    root.resetSubmitButton();
                     sendSignalToWallet({method: "walletSecurity_changeSecurityImageSuccess"});
                     root.justSubmitted = false;
                 }
             } else if (root.justSubmitted) {
                 // Error submitting new security image.
-                root.resetSubmitButton();
                 root.justSubmitted = false;
             }
         }
@@ -180,7 +178,8 @@ Item {
             // "Submit" button
             HifiControlsUit.Button {
                 id: securityImageSubmitButton;
-                enabled: securityImageSelection.currentIndex !== -1;
+                text: root.justSubmitted ? "Submitting..." : "Submit";
+                enabled: securityImageSelection.currentIndex !== -1 && !root.justSubmitted;
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.dark;
                 anchors.top: parent.top;
@@ -188,11 +187,8 @@ Item {
                 anchors.right: parent.right;
                 anchors.rightMargin: 20;
                 width: 150;
-                text: "Submit";
                 onClicked: {
                     root.justSubmitted = true;
-                    securityImageSubmitButton.text = "Submitting...";
-                    securityImageSubmitButton.enabled = false;
                     var securityImagePath = securityImageSelection.getImagePathFromImageID(securityImageSelection.getSelectedImageIndex())
                     Commerce.chooseSecurityImage(securityImagePath);
                 }
@@ -205,11 +201,6 @@ Item {
 
     signal sendSignalToWallet(var msg);
 
-    function resetSubmitButton() {
-        securityImageSubmitButton.enabled = true;
-        securityImageSubmitButton.text = "Submit";
-    }
-
     function initModel() {
         securityImageSelection.initModel();
     }
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
index c6c6056605..56b78c5865 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
@@ -24,7 +24,7 @@ Item {
     HifiConstants { id: hifi; }
 
     id: root;
-    property int currentIndex: securityImageGrid.currentIndex;
+    property alias currentIndex: securityImageGrid.currentIndex;
     
     // This will cause a bug -- if you bring up security image selection in HUD mode while
     // in HMD while having HMD preview enabled, then move, then finish passphrase selection,
@@ -98,6 +98,7 @@ Item {
 
     function initModel() {
         gridModel.initModel();
+        securityImageGrid.currentIndex = -1;
     }
 
     function resetSelection() {
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 8b73042ada..9599af827f 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -591,8 +591,8 @@ void Wallet::chooseSecurityImage(const QString& filename) {
     if (_securityImage) {
         delete _securityImage;
     }
-    QString path = qApp->applicationDirPath();
-    path.append("/resources/qml/hifi/commerce/wallet/");
+    QString path = PathUtils::resourcesPath();
+    path.append("/qml/hifi/commerce/wallet/");
     path.append(filename);
 
     // now create a new security image pixmap