From bed2c7106a820997d792687d081cc8b1418b4f93 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Mon, 28 Jul 2025 18:46:56 +0800
Subject: [PATCH 1/5] Added: current user in ContactGiftingView

- "You" is displayed conditionally, similar to GiftedDialog behavior
- "Show All" is hidden in GiftedDialog when accessed from ContactGiftingView (redundant)
---
 src/components/EntityGrid.vue          |  8 ++-
 src/components/EntitySelectionStep.vue |  5 ++
 src/components/GiftedDialog.vue        |  2 +
 src/views/ContactGiftingView.vue       | 77 +++++++++++++++++++++++++-
 4 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/src/components/EntityGrid.vue b/src/components/EntityGrid.vue
index ff995652..847f36e7 100644
--- a/src/components/EntityGrid.vue
+++ b/src/components/EntityGrid.vue
@@ -159,6 +159,10 @@ export default class EntityGrid extends Vue {
   @Prop({ default: "other party" })
   conflictContext!: string;
 
+  /** Whether to hide the "Show All" navigation */
+  @Prop({ default: false })
+  hideShowAll!: boolean;
+
   /**
    * Function to determine which entities to display (allows parent control)
    *
@@ -245,7 +249,9 @@ export default class EntityGrid extends Vue {
    * Whether to show the "Show All" navigation
    */
   get shouldShowAll(): boolean {
-    return this.entities.length > 0 && this.showAllRoute !== "";
+    return (
+      !this.hideShowAll && this.entities.length > 0 && this.showAllRoute !== ""
+    );
   }
 
   /**
diff --git a/src/components/EntitySelectionStep.vue b/src/components/EntitySelectionStep.vue
index 2c8008d3..b476ea00 100644
--- a/src/components/EntitySelectionStep.vue
+++ b/src/components/EntitySelectionStep.vue
@@ -27,6 +27,7 @@ Matthew Raymer */
       :show-all-query-params="showAllQueryParams"
       :notify="notify"
       :conflict-context="conflictContext"
+      :hide-show-all="hideShowAll"
       @entity-selected="handleEntitySelected"
     />
 
@@ -140,6 +141,10 @@ export default class EntitySelectionStep extends Vue {
   @Prop()
   notify?: (notification: NotificationIface, timeout?: number) => void;
 
+  /** Whether to hide the "Show All" navigation */
+  @Prop({ default: false })
+  hideShowAll!: boolean;
+
   /**
    * CSS classes for the cancel button
    */
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 127c2e2e..b88184a0 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -19,6 +19,7 @@
         :giver="giver"
         :receiver="receiver"
         :notify="$notify"
+        :hide-show-all="hideShowAll"
         @entity-selected="handleEntitySelected"
         @cancel="cancel"
       />
@@ -99,6 +100,7 @@ export default class GiftedDialog extends Vue {
   @Prop() toProjectId = "";
   @Prop({ default: false }) showProjects = false;
   @Prop() isFromProjectView = false;
+  @Prop({ default: false }) hideShowAll = false;
 
   @Watch("showProjects")
   onShowProjectsChange() {
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index d2577b28..66a29b52 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -17,6 +17,24 @@
 
     <!-- Results List -->
     <ul class="border-t border-slate-300">
+      <!-- "You" entity -->
+      <li v-if="shouldShowYouEntity" class="border-b border-slate-300 py-3">
+        <h2 class="text-base flex gap-4 items-center">
+          <span class="grow flex gap-2 items-center font-medium">
+            <font-awesome icon="hand" class="text-blue-500 text-4xl" />
+            <span class="text-blue-500">You</span>
+          </span>
+          <span class="text-right">
+            <button
+              type="button"
+              class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
+              @click="openDialog('You')"
+            >
+              <font-awesome icon="gift" class="fa-fw"></font-awesome>
+            </button>
+          </span>
+        </h2>
+      </li>
       <li class="border-b border-slate-300 py-3">
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow flex gap-2 items-center font-medium">
@@ -71,6 +89,7 @@
       :to-project-id="toProjectId"
       :show-projects="showProjects"
       :is-from-project-view="isFromProjectView"
+      :hide-show-all="true"
     />
   </section>
 </template>
@@ -180,7 +199,7 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(contact?: GiverReceiverInputInfo | "Unnamed") {
+  openDialog(contact?: GiverReceiverInputInfo | "Unnamed" | "You") {
     if (contact === "Unnamed") {
       // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
       let recipient: GiverReceiverInputInfo;
@@ -230,6 +249,55 @@ export default class ContactGiftingView extends Vue {
       );
       // Immediately select "Unnamed" and move to Step 2
       (this.$refs.customDialog as GiftedDialog).selectGiver();
+    } else if (contact === "You") {
+      // Special case: Handle "You" entity selection
+      let giver: GiverReceiverInputInfo;
+      let recipient: GiverReceiverInputInfo;
+
+      if (this.stepType === "giver") {
+        // We're selecting a giver, so "You" becomes the giver
+        giver = { did: this.activeDid, name: "You" };
+
+        // Recipient is either a project or the current user
+        if (this.recipientEntityType === "project") {
+          recipient = {
+            did: this.recipientProjectHandleId,
+            name: this.recipientProjectName,
+            image: this.recipientProjectImage,
+            handleId: this.recipientProjectHandleId,
+          };
+        } else {
+          recipient = { did: this.activeDid, name: "You" };
+        }
+      } else {
+        // We're selecting a recipient, so "You" becomes the recipient
+        recipient = { did: this.activeDid, name: "You" };
+
+        // Preserve the existing giver from the context
+        if (this.giverEntityType === "project") {
+          giver = {
+            did: this.giverProjectHandleId,
+            name: this.giverProjectName,
+            image: this.giverProjectImage,
+            handleId: this.giverProjectHandleId,
+          };
+        } else if (this.giverDid) {
+          giver = {
+            did: this.giverDid,
+            name: this.giverProjectName || "Someone",
+          };
+        } else {
+          giver = { did: this.activeDid, name: "You" };
+        }
+      }
+
+      (this.$refs.customDialog as GiftedDialog).open(
+        giver,
+        recipient,
+        undefined,
+        this.stepType === "giver" ? "Given by You" : "Given to You",
+        this.prompt,
+      );
     } else {
       // Regular case: contact is a GiverReceiverInputInfo
       let giver: GiverReceiverInputInfo;
@@ -283,5 +351,12 @@ export default class ContactGiftingView extends Vue {
       );
     }
   }
+
+  get shouldShowYouEntity(): boolean {
+    return (
+      this.stepType === "recipient" ||
+      (this.stepType === "giver" && this.isFromProjectView)
+    );
+  }
 }
 </script>
-- 
2.30.2


From 24f67305726ae272005a79f6e8832d6af80bc930 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Mon, 11 Aug 2025 19:06:42 +0800
Subject: [PATCH 2/5] Fix: remove redundant method

---
 src/views/ContactGiftingView.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index ada50d5c..9ebee31a 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -357,12 +357,5 @@ export default class ContactGiftingView extends Vue {
       (this.stepType === "giver" && this.isFromProjectView)
     );
   }
-
-  get shouldShowYouEntity(): boolean {
-    return (
-      this.stepType === "recipient" ||
-      (this.stepType === "giver" && this.isFromProjectView)
-    );
-  }
 }
 </script>
-- 
2.30.2


From 6d316c2b3f508e418678d12e29da4240f9f9cda4 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Mon, 11 Aug 2025 19:14:35 +0800
Subject: [PATCH 3/5] Fix: restored prop to show/hide "Show All"

---
 src/components/GiftedDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 286d88ec..a2ee61df 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -115,6 +115,7 @@ export default class GiftedDialog extends Vue {
   @Prop() fromProjectId = "";
   @Prop() toProjectId = "";
   @Prop() isFromProjectView = false;
+  @Prop() hideShowAll = false;
   @Prop({ default: "person" }) giverEntityType = "person" as
     | "person"
     | "project";
-- 
2.30.2


From ec1a72583278e832f397e881c46497dea0afa6a2 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Tue, 12 Aug 2025 18:34:47 +0800
Subject: [PATCH 4/5] Refactor: improve dialog logic and entity handling

- Split openDialog into separate methods to improve code readability and maintainability through method extraction
- Add receiver name fallback in GiftedDialog when receiver exists but has no name
- Enhance shouldShowYouEntity to prevent selecting "You" as both giver and recipient
- Improve labeling of "(No name)" entities while retaining original entity object properties
- Apply special styling to "Unnamed" and "(No Name)" entities
---
 src/components/EntitySummaryButton.vue |  36 +++-
 src/components/GiftedDialog.vue        |  13 +-
 src/components/PersonCard.vue          |  22 +-
 src/views/ContactGiftingView.vue       | 268 ++++++++++++-------------
 4 files changed, 182 insertions(+), 157 deletions(-)

diff --git a/src/components/EntitySummaryButton.vue b/src/components/EntitySummaryButton.vue
index 50f25078..96dae340 100644
--- a/src/components/EntitySummaryButton.vue
+++ b/src/components/EntitySummaryButton.vue
@@ -42,8 +42,8 @@ computed CSS properties * * @author Matthew Raymer */
       <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
         {{ label }}
       </p>
-      <h3 class="font-semibold truncate">
-        {{ entity?.name || "Unnamed" }}
+      <h3 :class="nameClasses">
+        {{ displayName }}
       </h3>
     </div>
 
@@ -138,6 +138,38 @@ export default class EntitySummaryButton extends Vue {
     return this.editable ? "text-blue-500" : "text-slate-400";
   }
 
+  /**
+   * Computed CSS classes for the entity name
+   */
+  get nameClasses(): string {
+    const baseClasses = "font-semibold truncate";
+    
+    // Add italic styling for special "Unnamed" or entities without set names
+    if (!this.entity?.name || this.entity?.did === "") {
+      return `${baseClasses} italic text-slate-500`;
+    }
+    
+    return baseClasses;
+  }
+
+  /**
+   * Computed display name for the entity
+   */
+  get displayName(): string {
+    // If the entity has a set name, use that name
+    if (this.entity?.name) {
+      return this.entity.name;
+    }
+    
+    // If the entity is the special "Unnamed", use "Unnamed"
+    if (this.entity?.did === "") {
+      return "Unnamed";
+    }
+    
+    // If the entity does not have a set name, but is not the special "Unnamed", use their DID
+    return this.entity?.did;
+  }
+
   /**
    * Handle click event - only call function prop if editable
    * Allows parent to control edit behavior and validation
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index a2ee61df..6979db74 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -226,14 +226,7 @@ export default class GiftedDialog extends Vue {
 
       this.allMyDids = await retrieveAccountDids();
 
-      if (this.giver && !this.giver.name) {
-        this.giver.name = didInfo(
-          this.giver.did,
-          this.activeDid,
-          this.allMyDids,
-          this.allContacts,
-        );
-      }
+
 
       if (
         this.giverEntityType === "project" ||
@@ -457,7 +450,7 @@ export default class GiftedDialog extends Vue {
     if (contact) {
       this.giver = {
         did: contact.did,
-        name: contact.name || contact.did,
+        name: contact.name,
       };
     } else {
       // Only set to "Unnamed" if no giver is currently set
@@ -519,7 +512,7 @@ export default class GiftedDialog extends Vue {
     if (contact) {
       this.receiver = {
         did: contact.did,
-        name: contact.name || contact.did,
+        name: contact.name,
       };
     } else {
       // Only set to "Unnamed" if no receiver is currently set
diff --git a/src/components/PersonCard.vue b/src/components/PersonCard.vue
index 1f3bf595..2c6f439a 100644
--- a/src/components/PersonCard.vue
+++ b/src/components/PersonCard.vue
@@ -25,7 +25,7 @@ conflict detection. * * @author Matthew Raymer */
     </div>
 
     <h3 :class="nameClasses">
-      {{ person.name || person.did || "Unnamed" }}
+      {{ displayName }}
     </h3>
   </li>
 </template>
@@ -98,9 +98,27 @@ export default class PersonCard extends Vue {
       return `${baseClasses} text-slate-400`;
     }
 
+    // Add italic styling for entities without set names
+    if (!this.person.name) {
+      return `${baseClasses} italic text-slate-500`;
+    }
+
     return baseClasses;
   }
 
+  /**
+   * Computed display name for the person
+   */
+  get displayName(): string {
+    // If the entity has a set name, use that name
+    if (this.person.name) {
+      return this.person.name;
+    }
+    
+    // If the entity does not have a set name
+    return this.person.did;
+  }
+
   /**
    * Handle card click - emit if selectable and not conflicted, show warning if conflicted
    */
@@ -114,7 +132,7 @@ export default class PersonCard extends Vue {
           group: "alert",
           type: "warning",
           title: "Cannot Select",
-          text: `You cannot select "${this.person.name || this.person.did || "Unnamed"}" because they are already selected as the ${this.conflictContext}.`,
+          text: `You cannot select "${this.displayName}" because they are already selected as the ${this.conflictContext}.`,
         },
         3000,
       );
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index 9ebee31a..2534f551 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -21,8 +21,8 @@
       <li v-if="shouldShowYouEntity" class="border-b border-slate-300 py-3">
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow flex gap-2 items-center font-medium">
-            <font-awesome icon="hand" class="text-blue-500 text-4xl" />
-            <span class="text-blue-500">You</span>
+            <font-awesome icon="hand" class="text-blue-500 text-4xl shrink-0" />
+            <span class="text-ellipsis overflow-hidden text-blue-500">You</span>
           </span>
           <span class="text-right">
             <button
@@ -40,9 +40,9 @@
           <span class="grow flex gap-2 items-center font-medium">
             <font-awesome
               icon="circle-question"
-              class="text-slate-400 text-4xl"
+              class="text-slate-400 text-4xl shrink-0"
             />
-            <span class="italic text-slate-400">(Unnamed/Unknown)</span>
+            <span class="text-ellipsis overflow-hidden italic text-slate-500">(Unnamed/Unknown)</span>
           </span>
           <span class="text-right">
             <button
@@ -61,14 +61,14 @@
         class="border-b border-slate-300 py-3"
       >
         <h2 class="text-base flex gap-4 items-center">
-          <span class="grow flex gap-2 items-center font-medium">
+          <span class="grow flex gap-2 items-center font-medium overflow-hidden">
             <EntityIcon
               :contact="contact"
               :icon-size="34"
-              class="inline-block align-middle border border-slate-300 rounded-full overflow-hidden"
+              class="inline-block align-middle border border-slate-300 rounded-full overflow-hidden shrink-0"
             />
-            <span v-if="contact.name">{{ contact.name }}</span>
-            <span v-else class="italic text-slate-400">(No name)</span>
+            <span v-if="contact.name" class="text-ellipsis overflow-hidden">{{ contact.name }}</span>
+            <span v-else class="text-ellipsis overflow-hidden italic text-slate-500">{{ contact.did }}</span>
           </span>
           <span class="text-right">
             <button
@@ -208,154 +208,136 @@ export default class ContactGiftingView extends Vue {
   }
 
   openDialog(contact?: GiverReceiverInputInfo | "Unnamed" | "You") {
-    if (contact === "Unnamed") {
-      // Special case: Handle "Unnamed" contacts for both givers and recipients
-      let recipient: GiverReceiverInputInfo;
-      let giver: GiverReceiverInputInfo | undefined;
+    // Determine the selected entity based on contact type
+    const selectedEntity = this.createEntityFromContact(contact);
 
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so preserve the existing recipient from context
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          // Preserve the existing recipient from context
-          if (this.recipientDid === this.activeDid) {
-            // Recipient was "You"
-            recipient = { did: this.activeDid, name: "You" };
-          } else if (this.recipientDid) {
-            // Recipient was a regular contact
-            recipient = {
-              did: this.recipientDid,
-              name: this.recipientProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "You" if no recipient was previously selected
-            recipient = { did: this.activeDid, name: "You" };
-          }
-        }
-        giver = undefined; // Will be set to "Unnamed" in GiftedDialog
-      } else {
-        // We're selecting a recipient, so recipient is "Unnamed" and giver is preserved from context
-        recipient = { did: "", name: "Unnamed" };
+    // Create giver and recipient based on step type and selected entity
+    const { giver, recipient } = this.createGiverAndRecipient(selectedEntity);
 
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else if (this.giverDid) {
-          giver = {
-            did: this.giverDid,
-            name: this.giverProjectName || "Someone",
-          };
-        } else {
-          giver = { did: this.activeDid, name: "You" };
-        }
-      }
+    // Open the dialog
+    (this.$refs.giftedDialog as GiftedDialog).open(
+      giver,
+      recipient,
+      this.offerId,
+      this.prompt,
+      this.description,
+      this.amountInput,
+      this.unitCode,
+    );
 
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        this.offerId,
-        this.prompt,
-        this.description,
-        this.amountInput,
-        this.unitCode,
-      );
+    // Move to Step 2 - entities are already set by the open() call
+    (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
+  }
 
-      // Move to Step 2 - entities are already set by the open() call
-      (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
-    } else {
-      // Regular case: contact is a GiverReceiverInputInfo
-      let giver: GiverReceiverInputInfo;
-      let recipient: GiverReceiverInputInfo;
+  /**
+   * Creates an entity object from the contact parameter
+   */
+  private createEntityFromContact(
+    contact?: GiverReceiverInputInfo | "Unnamed" | "You",
+  ): GiverReceiverInputInfo | undefined {
+    if (contact === "You") {
+      return { did: this.activeDid, name: "You" };
+    } else if (contact === "Unnamed") {
+      return { did: "", name: "Unnamed" };
+    } else if (contact) {
+      // Create a copy of the contact to avoid modifying the original
+      return { ...contact };
+    }
+    return undefined;
+  }
 
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so the contact becomes the giver
-        giver = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
+  /**
+   * Creates giver and recipient objects based on step type and selected entity
+   */
+  private createGiverAndRecipient(selectedEntity?: GiverReceiverInputInfo): {
+    giver: GiverReceiverInputInfo | undefined;
+    recipient: GiverReceiverInputInfo;
+  } {
+    if (this.stepType === "giver") {
+      // We're selecting a giver, so the selected entity becomes the giver
+      const giver = selectedEntity;
+      const recipient = this.createRecipientFromContext();
+      return { giver, recipient };
+    } else {
+      // We're selecting a recipient, so the selected entity becomes the recipient
+      const recipient = selectedEntity || { did: "", name: "Unnamed" };
+      const giver = this.createGiverFromContext();
+      return { giver, recipient };
+    }
+  }
 
-        // Preserve the existing recipient from the context
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          // 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 = {
-              did: this.recipientDid,
-              name: this.recipientProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "Unnamed"
-            recipient = { did: "", name: "Unnamed" };
-          }
-        }
+  /**
+   * Creates recipient object from context (preserves existing recipient)
+   */
+  private createRecipientFromContext(): GiverReceiverInputInfo {
+    if (this.recipientEntityType === "project") {
+      return {
+        did: this.recipientProjectHandleId,
+        name: this.recipientProjectName,
+        image: this.recipientProjectImage,
+        handleId: this.recipientProjectHandleId,
+      };
+    } else {
+      if (this.recipientDid === this.activeDid) {
+        return { did: this.activeDid, name: "You" };
+      } else if (this.recipientDid) {
+        return {
+          did: this.recipientDid,
+          name: this.recipientProjectName,
+        };
       } else {
-        // We're selecting a recipient, so the contact becomes the recipient
-        recipient = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
-
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else {
-          // 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 = {
-              did: this.giverDid,
-              name: this.giverProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "Unnamed"
-            giver = { did: "", name: "Unnamed" };
-          }
-        }
+        return { did: "", name: "Unnamed" };
       }
+    }
+  }
 
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        this.offerId,
-        this.prompt,
-        this.description,
-        this.amountInput,
-        this.unitCode,
-      );
-
-      // Move to Step 2 - entities are already set by the open() call
-      (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
+  /**
+   * Creates giver object from context (preserves existing giver)
+   */
+  private createGiverFromContext(): GiverReceiverInputInfo {
+    if (this.giverEntityType === "project") {
+      return {
+        did: this.giverProjectHandleId,
+        name: this.giverProjectName,
+        image: this.giverProjectImage,
+        handleId: this.giverProjectHandleId,
+      };
+    } else {
+      if (this.giverDid === this.activeDid) {
+        return { did: this.activeDid, name: "You" };
+      } else if (this.giverDid) {
+        return {
+          did: this.giverDid,
+          name: this.giverProjectName,
+        };
+      } else {
+        return { did: "", name: "Unnamed" };
+      }
     }
   }
 
   get shouldShowYouEntity(): boolean {
-    return (
-      this.stepType === "recipient" ||
-      (this.stepType === "giver" && this.isFromProjectView)
-    );
+    if (this.stepType === "giver") {
+      // When selecting a giver, show "You" if the current recipient is not "You"
+      // This prevents selecting yourself as both giver and recipient
+      if (this.recipientEntityType === "project") {
+        // If recipient is a project, we can select "You" as giver
+        return true;
+      } else {
+        // If recipient is a person, check if it's not "You"
+        return this.recipientDid !== this.activeDid;
+      }
+    } else {
+      // When selecting a recipient, show "You" if the current giver is not "You"
+      // This prevents selecting yourself as both giver and recipient
+      if (this.giverEntityType === "project") {
+        // If giver is a project, we can select "You" as recipient
+        return true;
+      } else {
+        // If giver is a person, check if it's not "You"
+        return this.giverDid !== this.activeDid;
+      }
+    }
   }
 }
 </script>
-- 
2.30.2


From a4528c570386bba5d885be0b4b587431bc8a2da5 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Fri, 15 Aug 2025 13:22:49 +0800
Subject: [PATCH 5/5] Refactor: eliminate "special" entity type and use
 DID-based logic

Replace string-based entity type matching with DID-based logic for "You" and "Unnamed" entities. Treat these as regular person entities instead of special types.

- Remove "special" type from EntitySelectionEvent interface
- Update EntityGrid to emit "You" and "Unnamed" as person entities
- Simplify SpecialEntityCard emit structure (remove entityType parameter)
- Refactor GiftedDialog to process all person entities with DID-based logic
- Update ContactGiftingView and HomeView to use DID-based entity creation
- Remove string literals "You" and "Unnamed" from method signatures
---
 src/components/EntityGrid.vue          | 23 ++++------
 src/components/EntitySelectionStep.vue |  5 +--
 src/components/GiftedDialog.vue        | 56 ++++++++++-------------
 src/components/SpecialEntityCard.vue   | 10 +----
 src/views/ContactGiftingView.vue       | 23 ++++++----
 src/views/HomeView.vue                 | 62 +++++++++++++++-----------
 6 files changed, 85 insertions(+), 94 deletions(-)

diff --git a/src/components/EntityGrid.vue b/src/components/EntityGrid.vue
index 847f36e7..2fcf7acb 100644
--- a/src/components/EntityGrid.vue
+++ b/src/components/EntityGrid.vue
@@ -310,16 +310,13 @@ export default class EntityGrid extends Vue {
 
   /**
    * Handle special entity selection from SpecialEntityCard
+   * Treat "You" and "Unnamed" as person entities
    */
-  handleEntitySelected(event: {
-    type: string;
-    entityType: string;
-    data: { did?: string; name: string };
-  }): void {
+  handleEntitySelected(event: { data: { did?: string; name: string } }): void {
+    // Convert special entities to person entities since they represent people
     this.emitEntitySelected({
-      type: "special",
-      entityType: event.entityType,
-      data: event.data,
+      type: "person",
+      data: event.data as Contact,
     });
   }
 
@@ -327,13 +324,11 @@ export default class EntityGrid extends Vue {
 
   @Emit("entity-selected")
   emitEntitySelected(data: {
-    type: "person" | "project" | "special";
-    entityType?: string;
-    data: Contact | PlanData | { did?: string; name: string };
+    type: "person" | "project";
+    data: Contact | PlanData;
   }): {
-    type: "person" | "project" | "special";
-    entityType?: string;
-    data: Contact | PlanData | { did?: string; name: string };
+    type: "person" | "project";
+    data: Contact | PlanData;
   } {
     return data;
   }
diff --git a/src/components/EntitySelectionStep.vue b/src/components/EntitySelectionStep.vue
index dcbd8490..2fb6bcac 100644
--- a/src/components/EntitySelectionStep.vue
+++ b/src/components/EntitySelectionStep.vue
@@ -56,9 +56,8 @@ interface EntityData {
  * Entity selection event data structure
  */
 interface EntitySelectionEvent {
-  type: "person" | "project" | "special";
-  entityType?: string;
-  data: Contact | PlanData | EntityData;
+  type: "person" | "project";
+  data: Contact | PlanData;
 }
 
 /**
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 923596fd..ec78ddf4 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -561,20 +561,21 @@ export default class GiftedDialog extends Vue {
 
   /**
    * Handle entity selection from EntitySelectionStep
-   * @param entity - The selected entity (person, project, or special) with stepType
+   * @param entity - The selected entity (person or project) with stepType
    */
   handleEntitySelected(entity: {
-    type: "person" | "project" | "special";
-    entityType?: string;
-    data: Contact | PlanData | { did?: string; name: string };
+    type: "person" | "project";
+    data: Contact | PlanData;
     stepType: string;
   }) {
     if (entity.type === "person") {
       const contact = entity.data as Contact;
+      // Apply DID-based logic for person entities
+      const processedContact = this.processPersonEntity(contact);
       if (entity.stepType === "giver") {
-        this.selectGiver(contact);
+        this.selectGiver(processedContact);
       } else {
-        this.selectRecipient(contact);
+        this.selectRecipient(processedContact);
       }
     } else if (entity.type === "project") {
       const project = entity.data as PlanData;
@@ -583,33 +584,22 @@ export default class GiftedDialog extends Vue {
       } else {
         this.selectRecipientProject(project);
       }
-    } else if (entity.type === "special") {
-      // Handle special entities like "You" and "Unnamed"
-      if (entity.entityType === "you") {
-        // "You" entity selected
-        const youEntity = {
-          did: this.activeDid,
-          name: "You",
-        };
-        if (entity.stepType === "giver") {
-          this.giver = youEntity;
-        } else {
-          this.receiver = youEntity;
-        }
-        this.firstStep = false;
-      } else if (entity.entityType === "unnamed") {
-        // "Unnamed" entity selected
-        const unnamedEntity = {
-          did: "",
-          name: "Unnamed",
-        };
-        if (entity.stepType === "giver") {
-          this.giver = unnamedEntity;
-        } else {
-          this.receiver = unnamedEntity;
-        }
-        this.firstStep = false;
-      }
+    }
+  }
+
+  /**
+   * Processes person entities using DID-based logic for "You" and "Unnamed"
+   */
+  private processPersonEntity(contact: Contact): Contact {
+    if (contact.did === this.activeDid) {
+      // If DID matches active DID, create "You" entity
+      return { ...contact, name: "You" };
+    } else if (!contact.did || contact.did === "") {
+      // If DID is empty/null, create "Unnamed" entity
+      return { ...contact, name: "Unnamed" };
+    } else {
+      // Return the contact as-is
+      return contact;
     }
   }
 
diff --git a/src/components/SpecialEntityCard.vue b/src/components/SpecialEntityCard.vue
index 1d475229..e489d003 100644
--- a/src/components/SpecialEntityCard.vue
+++ b/src/components/SpecialEntityCard.vue
@@ -124,8 +124,6 @@ export default class SpecialEntityCard extends Vue {
   handleClick(): void {
     if (this.selectable && !this.conflicted) {
       this.emitEntitySelected({
-        type: "special",
-        entityType: this.entityType,
         data: this.entityData,
       });
     } else if (this.conflicted && this.notify) {
@@ -145,13 +143,7 @@ export default class SpecialEntityCard extends Vue {
   // Emit methods using @Emit decorator
 
   @Emit("entity-selected")
-  emitEntitySelected(data: {
-    type: string;
-    entityType: string;
-    data: { did?: string; name: string };
-  }): {
-    type: string;
-    entityType: string;
+  emitEntitySelected(data: { data: { did?: string; name: string } }): {
     data: { did?: string; name: string };
   } {
     return data;
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index 2534f551..f27abc13 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -28,7 +28,7 @@
             <button
               type="button"
               class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
-              @click="openDialog('You')"
+              @click="openDialog({ did: activeDid, name: 'You' })"
             >
               <font-awesome icon="gift" class="fa-fw"></font-awesome>
             </button>
@@ -48,7 +48,7 @@
             <button
               type="button"
               class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
-              @click="openDialog('Unnamed')"
+              @click="openDialog({ did: '', name: 'Unnamed' })"
             >
               <font-awesome icon="gift" class="fa-fw"></font-awesome>
             </button>
@@ -207,7 +207,7 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(contact?: GiverReceiverInputInfo | "Unnamed" | "You") {
+  openDialog(contact?: GiverReceiverInputInfo) {
     // Determine the selected entity based on contact type
     const selectedEntity = this.createEntityFromContact(contact);
 
@@ -231,19 +231,26 @@ export default class ContactGiftingView extends Vue {
 
   /**
    * Creates an entity object from the contact parameter
+   * Uses DID-based logic to determine "You" and "Unnamed" entities
    */
   private createEntityFromContact(
-    contact?: GiverReceiverInputInfo | "Unnamed" | "You",
+    contact?: GiverReceiverInputInfo,
   ): GiverReceiverInputInfo | undefined {
-    if (contact === "You") {
+    if (!contact) {
+      return undefined;
+    }
+
+    // Handle GiverReceiverInputInfo object
+    if (contact.did === this.activeDid) {
+      // If DID matches active DID, create "You" entity
       return { did: this.activeDid, name: "You" };
-    } else if (contact === "Unnamed") {
+    } else if (!contact.did || contact.did === "") {
+      // If DID is empty/null, create "Unnamed" entity
       return { did: "", name: "Unnamed" };
-    } else if (contact) {
+    } else {
       // Create a copy of the contact to avoid modifying the original
       return { ...contact };
     }
-    return undefined;
   }
 
   /**
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 4af9b5bc..7c4789f7 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1475,30 +1475,41 @@ export default class HomeView extends Vue {
    * @param giver Optional contact info for giver
    * @param description Optional gift description
    */
-  openDialog(giver?: GiverReceiverInputInfo | "Unnamed", prompt?: string) {
-    if (giver === "Unnamed") {
-      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        undefined,
-        {
-          did: this.activeDid,
-          name: "You",
-        } as GiverReceiverInputInfo,
-        undefined,
-        prompt,
-      );
-      // Immediately select "Unnamed" and move to Step 2
-      (this.$refs.giftedDialog as GiftedDialog).selectGiver();
+  openDialog(giver?: GiverReceiverInputInfo, prompt?: string) {
+    // Determine the giver entity based on DID logic
+    const giverEntity = this.createGiverEntity(giver);
+
+    (this.$refs.giftedDialog as GiftedDialog).open(
+      giverEntity,
+      {
+        did: this.activeDid,
+        name: "You", // In HomeView, we always use "You" as the giver
+      } as GiverReceiverInputInfo,
+      undefined,
+      prompt,
+    );
+  }
+
+  /**
+   * Creates giver entity using DID-based logic
+   */
+  private createGiverEntity(
+    giver?: GiverReceiverInputInfo,
+  ): GiverReceiverInputInfo | undefined {
+    if (!giver) {
+      return undefined;
+    }
+
+    // Handle GiverReceiverInputInfo object
+    if (giver.did === this.activeDid) {
+      // If DID matches active DID, create "You" entity
+      return { did: this.activeDid, name: "You" };
+    } else if (!giver.did || giver.did === "") {
+      // If DID is empty/null, create "Unnamed" entity
+      return { did: "", name: "Unnamed" };
     } else {
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        giver,
-        {
-          did: this.activeDid,
-          name: "You",
-        } as GiverReceiverInputInfo,
-        undefined,
-        prompt,
-      );
+      // Return the giver as-is
+      return giver;
     }
   }
 
@@ -1627,10 +1638,7 @@ export default class HomeView extends Vue {
     }
   }
 
-  openPersonDialog(
-    giver?: GiverReceiverInputInfo | "Unnamed",
-    prompt?: string,
-  ) {
+  openPersonDialog(giver?: GiverReceiverInputInfo, prompt?: string) {
     this.showProjectsDialog = false;
     this.openDialog(giver, prompt);
   }
-- 
2.30.2