forked from trent_larson/crowd-funder-for-time-pwa
Merge branch 'build-improvement' into performance-optimizations-testing
This commit is contained in:
@@ -209,8 +209,6 @@ export default class GiftedDialog extends Vue {
|
|||||||
this.firstStep = !giver;
|
this.firstStep = !giver;
|
||||||
this.stepType = "giver";
|
this.stepType = "giver";
|
||||||
|
|
||||||
// Entity types are now set via props, no need to call updateEntityTypes()
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const settings = await this.$settings();
|
const settings = await this.$settings();
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
|
|||||||
@@ -263,10 +263,10 @@ export default class ContactGiftingView extends Vue {
|
|||||||
handleId: this.recipientProjectHandleId,
|
handleId: this.recipientProjectHandleId,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Check if the preserved recipient was "Unnamed" (empty DID) or a regular contact
|
// Check if the preserved recipient was "You" or a regular contact
|
||||||
if (this.recipientDid === "") {
|
if (this.recipientDid === this.activeDid) {
|
||||||
// Recipient was "Unnamed"
|
// Recipient was "You"
|
||||||
recipient = { did: "", name: "Unnamed" };
|
recipient = { did: this.activeDid, name: "You" };
|
||||||
} else if (this.recipientDid) {
|
} else if (this.recipientDid) {
|
||||||
// Recipient was a regular contact
|
// Recipient was a regular contact
|
||||||
recipient = {
|
recipient = {
|
||||||
@@ -274,8 +274,8 @@ export default class ContactGiftingView extends Vue {
|
|||||||
name: this.recipientProjectName || "Someone",
|
name: this.recipientProjectName || "Someone",
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Fallback to current user
|
// Fallback to "Unnamed"
|
||||||
recipient = { did: this.activeDid, name: "You" };
|
recipient = { did: "", name: "Unnamed" };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -291,10 +291,10 @@ export default class ContactGiftingView extends Vue {
|
|||||||
handleId: this.giverProjectHandleId,
|
handleId: this.giverProjectHandleId,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Check if the preserved giver was "Unnamed" (empty DID) or a regular contact
|
// Check if the preserved giver was "You" or a regular contact
|
||||||
if (this.giverDid === "") {
|
if (this.giverDid === this.activeDid) {
|
||||||
// Giver was "Unnamed"
|
// Giver was "You"
|
||||||
giver = { did: "", name: "Unnamed" };
|
giver = { did: this.activeDid, name: "You" };
|
||||||
} else if (this.giverDid) {
|
} else if (this.giverDid) {
|
||||||
// Giver was a regular contact
|
// Giver was a regular contact
|
||||||
giver = {
|
giver = {
|
||||||
@@ -302,8 +302,8 @@ export default class ContactGiftingView extends Vue {
|
|||||||
name: this.giverProjectName || "Someone",
|
name: this.giverProjectName || "Someone",
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Fallback to current user
|
// Fallback to "Unnamed"
|
||||||
giver = { did: this.activeDid, name: "You" };
|
giver = { did: "", name: "Unnamed" };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user