From 726c1ed8169241ee1eeca7a8c153c2125ea4e974 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 17:05:46 -0800
Subject: [PATCH] receiveAt with new key

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml       | 1 -
 interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml | 2 +-
 interface/src/commerce/Wallet.cpp                             | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 63ed5294be..90db00268c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -792,7 +792,6 @@ Rectangle {
 
     function walletResetSetup() {
         root.activeView = "walletSetup";
-        Commerce.resetLocalWalletOnly();
         var timestamp = new Date();
         walletSetup.startingTimestamp = timestamp;
         walletSetup.setupAttemptID = generateUUID();
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 6234d82139..20d5212ecb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -205,7 +205,7 @@ Item {
                         "This step cannot be undone.";
                     lightboxPopup.button1color = hifi.buttons.red;
                     lightboxPopup.button1text = "YES, CREATE NEW WALLET";
-                    lightboxPopup.button1method = "proceed(true);root.visible = false;";
+                    lightboxPopup.button1method = "root.visible = false;proceed(true);";
                     lightboxPopup.button2text = "CANCEL";
                     lightboxPopup.button2method = "root.visible = false;"
                     lightboxPopup.buttonLayout = "topbottom";
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 0e566bc019..a53f3cba56 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -541,7 +541,6 @@ bool Wallet::generateKeyPair() {
 
     // TODO: redo this soon -- need error checking and so on
     writeSecurityImage(_securityImage, keyFilePath());
-    QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last();
     QString key = keyPair.first->toBase64();
     _publicKeys.push_back(key);
     qCDebug(commerce) << "public key:" << key;
@@ -551,7 +550,7 @@ bool Wallet::generateKeyPair() {
     // 2. It is maximally private, and we can step back from that later if desired.
     // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
     auto ledger = DependencyManager::get<Ledger>();
-    return ledger->receiveAt(key, oldKey);
+    return ledger->receiveAt(key, "");
 }
 
 QStringList Wallet::listPublicKeys() {