Merge branch 'build-improvement' into performance-optimizations-testing

src/components/GiftedDialog.vue

@@ -209,8 +209,6 @@ export default class GiftedDialog extends Vue {
     this.firstStep = !giver;
     this.stepType = "giver";
 
-    // Entity types are now set via props, no need to call updateEntityTypes()
-
     try {
       const settings = await this.$settings();
       this.apiServer = settings.apiServer || "";

src/views/ContactGiftingView.vue

@@ -263,10 +263,10 @@ export default class ContactGiftingView extends Vue {
             handleId: this.recipientProjectHandleId,
           };
         } else {
-          // Check if the preserved recipient was "Unnamed" (empty DID) or a regular contact
-          if (this.recipientDid === "") {
-            // Recipient was "Unnamed"
-            recipient = { did: "", name: "Unnamed" };
+          // Check if the preserved recipient was "You" or a regular contact
+          if (this.recipientDid === this.activeDid) {
+            // Recipient was "You"
+            recipient = { did: this.activeDid, name: "You" };
           } else if (this.recipientDid) {
             // Recipient was a regular contact
             recipient = {
@@ -274,8 +274,8 @@ export default class ContactGiftingView extends Vue {
               name: this.recipientProjectName || "Someone",
             };
           } else {
-            // Fallback to current user
-            recipient = { did: this.activeDid, name: "You" };
+            // Fallback to "Unnamed"
+            recipient = { did: "", name: "Unnamed" };
           }
         }
       } else {
@@ -291,10 +291,10 @@ export default class ContactGiftingView extends Vue {
             handleId: this.giverProjectHandleId,
           };
         } else {
-          // Check if the preserved giver was "Unnamed" (empty DID) or a regular contact
-          if (this.giverDid === "") {
-            // Giver was "Unnamed"
-            giver = { did: "", name: "Unnamed" };
+          // Check if the preserved giver was "You" or a regular contact
+          if (this.giverDid === this.activeDid) {
+            // Giver was "You"
+            giver = { did: this.activeDid, name: "You" };
           } else if (this.giverDid) {
             // Giver was a regular contact
             giver = {
@@ -302,8 +302,8 @@ export default class ContactGiftingView extends Vue {
               name: this.giverProjectName || "Someone",
             };
           } else {
-            // Fallback to current user
-            giver = { did: this.activeDid, name: "You" };
+            // Fallback to "Unnamed"
+            giver = { did: "", name: "Unnamed" };
           }
         }
       }