Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-11 17:55:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bugfix/fix-custom-property-value-field

Browse Source
This commit is contained in:
Phillip 2023-11-08 18:03:41 +02:00 committed by GitHub
commit d726155cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/friends-view/profile.js
View File

@ -593,7 +593,7 @@ class ProfileQdn extends connect(store)(LitElement) {
this.resourceExists = true;
this.profileData = data;
store.dispatch(setProfileData(data));
parentEpml.request('showSnackBar', get('profile.profile22'))
worker.terminate();
} catch (error) {

38
plugins/plugins/core/sponsorship-list/sponsorship-list.src.js
View File

@ -721,23 +721,29 @@ class SponsorshipList extends LitElement {
}
const getTxnRequestResponse = (txnResponse) => {
if(txnResponse.extraData.rewardSharePrivateKey && (txnResponse.data.message.includes('multiple') || txnResponse.data.message.includes('SELF_SHARE_EXISTS'))) {
this.privateRewardShareKey = txnResponse.extraData.rewardSharePrivateKey
this.confirmRelationship(publicKeyValue, isCopy)
} else if (txnResponse.success === false && txnResponse?.message) {
this.errorMessage = txnResponse?.message
this.isLoadingCreateSponsorship = false
throw(txnResponse?.message)
} else if (
txnResponse.success === true &&
!txnResponse.data.error
) {
this.privateRewardShareKey = txnResponse.extraData.rewardSharePrivateKey
this.confirmRelationship(publicKeyValue, isCopy)
const extraData = txnResponse && txnResponse.extraData;
const data = txnResponse && txnResponse.data;
const dataMessage = data && data.message;
const extraDataPrivateKey = extraData && extraData.rewardSharePrivateKey;
const txnSuccess = txnResponse && txnResponse.success;
if (extraDataPrivateKey && typeof dataMessage === 'string' &&
(dataMessage.includes('multiple') || dataMessage.includes('SELF_SHARE_EXISTS'))) {
this.privateRewardShareKey = extraDataPrivateKey;
this.confirmRelationship(publicKeyValue, isCopy);
} else if (txnSuccess === false && txnResponse.message) {
this.errorMessage = txnResponse.message;
this.isLoadingCreateSponsorship = false;
throw new Error(txnResponse.message);
} else if (txnSuccess === true && !(data && data.error)) {
this.privateRewardShareKey = extraDataPrivateKey;
this.confirmRelationship(publicKeyValue, isCopy);
} else {
this.errorMessage = txnResponse.data.message || txnResponse.message
this.isLoadingCreateSponsorship = false
throw(txnResponse.data.message || txnResponse.message)
const defaultErrorMessage = 'An unknown error occurred.';
this.errorMessage = dataMessage || txnResponse.message || defaultErrorMessage;
this.isLoadingCreateSponsorship = false;
throw new Error(dataMessage || txnResponse.message || defaultErrorMessage);
}
}
validateReceiver()