From db16035f26a25903888c4ef8afe6dca0deca7039 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 21 Aug 2017 15:07:54 -0700
Subject: [PATCH] Parse balance correctly

---
 interface/resources/qml/hifi/commerce/wallet/WalletHome.qml     | 2 +-
 .../resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 6bca18c861..19da700de2 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -28,7 +28,7 @@ Item {
     Hifi.QmlCommerce {
         id: commerce;
         onBalanceResult : {
-            balanceText.text = parseFloat(balance/100).toFixed(2);
+            balanceText.text = parseFloat(result.data.balance/100).toFixed(2);
         }
     }
     
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
index d25ebe379a..1d12afda79 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
@@ -451,6 +451,7 @@ Rectangle {
                         root.lastPage = "passphrase";
                         choosePassphraseContainer.visible = false;
                         privateKeysReadyContainer.visible = true;
+                        commerce.balance(); // Do this here so that keys are generated. Order might change as backend changes?
                     }
                 }
             }