diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 1fe0dcc58b..fd7ce0fdfd 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -196,7 +196,38 @@ Item {
anchors.bottom: parent.bottom;
anchors.left: parent.left;
anchors.right: parent.right;
- anchors.rightMargin: 24;
+
+ Item {
+ visible: transactionHistoryModel.count === 0 && root.historyReceived;
+ anchors.centerIn: parent;
+ width: parent.width - 12;
+ height: parent.height;
+
+ HifiControlsUit.Separator {
+ colorScheme: 1;
+ anchors.left: parent.left;
+ anchors.right: parent.right;
+ anchors.top: parent.top;
+ }
+
+ RalewayRegular {
+ id: noActivityText;
+ text: "The Wallet app is in closed Beta.
To request entry and receive free HFC, please contact " +
+ "info@highfidelity.com with your High Fidelity account username and the email address registered to that account.";
+ // Text size
+ size: 24;
+ // Style
+ color: hifi.colors.blueAccent;
+ anchors.left: parent.left;
+ anchors.leftMargin: 12;
+ anchors.right: parent.right;
+ anchors.rightMargin: 12;
+ anchors.verticalCenter: parent.verticalCenter;
+ height: paintedHeight;
+ wrapMode: Text.WordWrap;
+ horizontalAlignment: Text.AlignHCenter;
+ }
+ }
ListView {
id: transactionHistory;
@@ -294,17 +325,6 @@ Item {
}
}
}
-
- // This should never be visible (since you immediately get 100 HFC)
- FiraSansRegular {
- id: emptyTransationHistory;
- size: 24;
- visible: !transactionHistory.visible && root.historyReceived;
- text: "Recent Activity Unavailable";
- anchors.fill: parent;
- horizontalAlignment: Text.AlignHCenter;
- verticalAlignment: Text.AlignVCenter;
- }
}
}
@@ -350,7 +370,9 @@ Item {
}
root.pendingCount = pendingCount;
- transactionHistoryModel.insert(0, {"transaction_type": "pendingCount"});
+ if (pendingCount > 0) {
+ transactionHistoryModel.insert(0, {"transaction_type": "pendingCount"});
+ }
}
//
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index f607c923ee..904847cb5f 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -90,7 +90,7 @@ void Ledger::buy(const QString& hfc_key, int cost, const QString& asset_id, cons
signedSend("transaction", transactionString, hfc_key, "buy", "buySuccess", "buyFailure", controlled_failure);
}
-bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key, const QString& machine_fingerprint) {
+bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key) {
auto accountManager = DependencyManager::get();
if (!accountManager->isLoggedIn()) {
qCWarning(commerce) << "Cannot set receiveAt when not logged in.";
@@ -99,13 +99,7 @@ bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key, const QSt
return false; // We know right away that we will fail, so tell the caller.
}
- QJsonObject transaction;
- transaction["hfc_key"] = hfc_key;
- transaction["machine_fingerprint"] = machine_fingerprint;
- QJsonDocument transactionDoc{ transaction };
- auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
-
- signedSend("transaction", transactionString, old_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
+ signedSend("public_key", hfc_key.toUtf8(), old_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
return true; // Note that there may still be an asynchronous signal of failure that callers might be interested in.
}
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 54f3f780f3..42eb0ffc49 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -26,7 +26,7 @@ class Ledger : public QObject, public Dependency {
public:
void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false);
- bool receiveAt(const QString& hfc_key, const QString& old_key, const QString& machine_fingerprint);
+ bool receiveAt(const QString& hfc_key, const QString& old_key);
void balance(const QStringList& keys);
void inventory(const QStringList& keys);
void history(const QStringList& keys);
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 9bc8dc9e43..85632ff8f1 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -16,7 +16,6 @@
#include "ui/ImageProvider.h"
#include "scripting/HMDScriptingInterface.h"
-#include
#include
#include
#include
@@ -542,8 +541,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();
- QString machineFingerprint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
- return ledger->receiveAt(key, oldKey, machineFingerprint);
+ return ledger->receiveAt(key, oldKey);
}
QStringList Wallet::listPublicKeys() {