Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 01:57:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11739 from zfox23/commerce_setPassphraseWhenLogout

Browse source 
Reset Wallet passphrase when login username changes
This commit is contained in:
Zach Fox 2017-11-02 19:46:00 -07:00 committed by GitHub
commit 35343da281
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
View file

@ -86,7 +86,7 @@ Rectangle {
root.dateOfPurchase = ""; root.dateOfPurchase = "";
root.itemEdition = "Uncertified Copy"; root.itemEdition = "Uncertified Copy";
errorText.text = "The certificate associated with this entity is invalid."; errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
errorText.color = hifi.colors.baseGray; errorText.color = hifi.colors.baseGray;
} else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
root.isCertificateInvalid = true; root.isCertificateInvalid = true;
@ -99,7 +99,7 @@ Rectangle {
root.dateOfPurchase = ""; root.dateOfPurchase = "";
root.itemEdition = "Uncertified Copy"; root.itemEdition = "Uncertified Copy";
errorText.text = "The certificate associated with this entity is invalid."; errorText.text = "The avatar who rezzed this item doesn't own it.";
errorText.color = hifi.colors.baseGray; errorText.color = hifi.colors.baseGray;
} else { } else {
console.log("Unknown certificate status received from ledger signal!"); console.log("Unknown certificate status received from ledger signal!");

5
interface/src/commerce/QmlCommerce.cpp
View file

@ -31,6 +31,11 @@ QmlCommerce::QmlCommerce(QQuickItem* parent) : OffscreenQmlDialog(parent) {
connect(wallet.data(), &Wallet::walletStatusResult, this, &QmlCommerce::walletStatusResult); connect(wallet.data(), &Wallet::walletStatusResult, this, &QmlCommerce::walletStatusResult);
connect(ledger.data(), &Ledger::certificateInfoResult, this, &QmlCommerce::certificateInfoResult); connect(ledger.data(), &Ledger::certificateInfoResult, this, &QmlCommerce::certificateInfoResult);
connect(ledger.data(), &Ledger::updateCertificateStatus, this, &QmlCommerce::updateCertificateStatus); connect(ledger.data(), &Ledger::updateCertificateStatus, this, &QmlCommerce::updateCertificateStatus);
auto accountManager = DependencyManager::get<AccountManager>();
connect(accountManager.data(), &AccountManager::usernameChanged, [&]() {
setPassphrase("");
});
} }
void QmlCommerce::getWalletStatus() { void QmlCommerce::getWalletStatus() {