From 763ce7330624a1be9e6ced41b004891d46eba26d Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 22 Aug 2017 12:26:46 -0700
Subject: [PATCH] Taking a break now

---
 .../resources/qml/hifi/commerce/wallet/Wallet.qml      | 10 +++++-----
 .../resources/qml/hifi/commerce/wallet/WalletHome.qml  |  3 ++-
 .../qml/hifi/commerce/wallet/WalletSetupLightbox.qml   |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index de207446a5..23989f0db5 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -33,15 +33,15 @@ Rectangle {
         id: commerce;
 
         onSecurityImageResult: {
-            if (imageID === 0 && root.lastPage === "securityImage") { // "If security image is set up"
-                // ERROR! Invalid security image.
-                securityImageContainer.visible = true;
-                choosePassphraseContainer.visible = false;
+            if (imageID === 0) { // "If security image is not set up"
+                if (root.activeView !== "notSetUp") {
+                    root.activeView = "notSetUp";
+                }
             }
         }
 
         onKeyFilePathResult: {
-            if (path === "") {
+            if (path === "" && root.activeView !== "notSetUp") {
                 root.activeView = "notSetUp";
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index febf823564..281d110f21 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -30,7 +30,8 @@ Item {
 
         onSecurityImageResult: {
             if (imageID !== 0) { // "If security image is set up"
-                securityImage.source = securityImageModel.getImagePathFromImageID(imageID);
+                var path = securityImageModel.getImagePathFromImageID(imageID);
+                securityImage.source = path;
             }
         }
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
index c021501e43..ecb277f800 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
@@ -554,6 +554,7 @@ Rectangle {
             anchors.top: explanationText.bottom;
             anchors.topMargin: 10;
             anchors.left: parent.left;
+            anchors.leftMargin: 16;
             anchors.right: clipboardButton.left;
             height: 40;
             readOnly: true;
@@ -569,6 +570,7 @@ Rectangle {
             color: hifi.buttons.black;
             colorScheme: hifi.colorSchemes.dark;
             anchors.right: parent.right;
+            anchors.rightMargin: 16;
             anchors.top: keyFilePath.top;
             anchors.bottom: keyFilePath.bottom;
             width: height;