Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 09:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Frontend changes

Browse source
This commit is contained in:
Zach Fox 2017-11-08 10:24:26 -08:00
parent bd0c87ddad
commit b7163bb8fc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
View file

@ -212,7 +212,8 @@ Item {
RalewayRegular { RalewayRegular {
id: noActivityText; id: noActivityText;
text: "No activity yet.<br><br><br>Looking for a little spending money?<br>Click the button below to apply for your <b>free HFC</b>!"; text: "<b>The Wallet app is in closed Beta.</b><br><br>To request entry and <b>receive free HFC</b>, please contact " +
"<b>info@highfidelity.com</b> with your High Fidelity account username and the email address registered to that account.";
// Text size // Text size
size: 24; size: 24;
// Style // Style

2
interface/src/commerce/Ledger.cpp
View file

@ -43,7 +43,6 @@ QJsonObject Ledger::failResponse(const QString& label, QNetworkReply& reply) {
#define FailHandler(NAME) void Ledger::NAME##Failure(QNetworkReply& reply) { emit NAME##Result(failResponse(#NAME, reply)); } #define FailHandler(NAME) void Ledger::NAME##Failure(QNetworkReply& reply) { emit NAME##Result(failResponse(#NAME, reply)); }
#define Handler(NAME) ApiHandler(NAME) FailHandler(NAME) #define Handler(NAME) ApiHandler(NAME) FailHandler(NAME)
Handler(buy) Handler(buy)
Handler(receiveAt)
Handler(balance) Handler(balance)
Handler(inventory) Handler(inventory)
@ -99,6 +98,7 @@ void Ledger::receiveAtSuccess(QNetworkReply& reply) {
wallet->setMustRegenerateKeypair(true); wallet->setMustRegenerateKeypair(true);
} }
} }
void Ledger::receiveAtFailure(QNetworkReply& reply) { failResponse("receiveAt", reply); }
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, const QString& machine_fingerprint) {
auto accountManager = DependencyManager::get<AccountManager>(); auto accountManager = DependencyManager::get<AccountManager>();
if (!accountManager->isLoggedIn()) { if (!accountManager->isLoggedIn()) {