Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1

Browse source
This commit is contained in:
Zach Fox 2018-01-16 15:07:53 -08:00
commit 8cc427a374
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -383,7 +383,7 @@ Item {
AnonymousProRegular {
id: hfcText;
text: model.hfc_text;
text: model.hfc_text || '';
// Style
size: 18;
anchors.left: parent.left;

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

@ -171,7 +171,7 @@ QString transactionString(const QJsonObject& valueObject) {
}
// no matter what we append a smaller date to the bottom of this...
result += QString("<br><font size='-2' color='#1080B8'>%1").arg(createdAt.toLocalTime().toString());
result += QString("<br><font size='-2' color='#1080B8'>%1").arg(createdAt.toLocalTime().toString(Qt::DefaultLocaleShortDate));
return result;
}