Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:15:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix wallet, use text from server in history (for now)

Browse source
This commit is contained in:
David Kelly 2017-08-28 17:02:53 -07:00
parent 3955624e63
commit a7af114144
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,8 @@ Item {
onHistoryResult : { onHistoryResult : {
if (result.status == 'success') { if (result.status == 'success') {
transactionHistory.text = result.data.history; var txt = result.data.history.map(function(h) { return h.text; }).join("<hr>");
transactionHistoryText.text = txt;
} }
} }
} }
@ -234,18 +235,14 @@ Item {
anchors.right: parent.right; anchors.right: parent.right;
// some placeholder stuff // some placeholder stuff
RalewayRegular { TextArea {
id: transactionHistoryText; id: transactionHistoryText;
text: homeMessage.visible ? "you <b>CANNOT</b> scroll through this." : "you <b>CAN</b> scroll through this"; text: "<hr>history unavailable<hr>";
// Text size textFormat: TextEdit.AutoText;
size: 16; font.pointSize: 10;
// Anchors
anchors.fill: parent; anchors.fill: parent;
// Style horizontalAlignment: Text.AlignLeft;
color: hifi.colors.darkGray; verticalAlignment: Text.AlignTop;
// Alignment
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
} }
} }
@ -359,6 +356,7 @@ Item {
} }
} }
signal sendSignalToWallet(var msg); signal sendSignalToWallet(var msg);
// //
// FUNCTION DEFINITIONS END // FUNCTION DEFINITIONS END
// //

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

@ -347,7 +347,7 @@ bool Wallet::createIfNeeded() {
qCDebug(commerce) << "read private key"; qCDebug(commerce) << "read private key";
RSA_free(key); RSA_free(key);
// K -- add the public key since we have a legit private key associated with it // K -- add the public key since we have a legit private key associated with it
_publicKeys.push_back(QUrl::toPercentEncoding(publicKey.toBase64())); _publicKeys.push_back(publicKey.toBase64());
return false; return false;
} }
} }