Merge branch 'master' into contact-gifting-current-user

src/components/EntitySelectionStep.vue

@@ -137,6 +137,20 @@ export default class EntitySelectionStep extends Vue {
   @Prop()
   receiver?: EntityData | null;
 
+  /** Form field values to preserve when navigating to "Show All" */
+  @Prop({ default: "" })
+  description!: string;
+
+  @Prop({ default: "0" })
+  amountInput!: string;
+
+  @Prop({ default: "HUR" })
+  unitCode!: string;
+
+  /** Offer ID for context when fulfilling an offer */
+  @Prop({ default: "" })
+  offerId!: string;
+
   /** Notification function from parent component */
   @Prop()
   notify?: (notification: NotificationIface, timeout?: number) => void;
@@ -225,34 +239,41 @@ export default class EntitySelectionStep extends Vue {
    * Query parameters for "Show All" navigation
    */
   get showAllQueryParams(): Record<string, string> {
-    if (this.shouldShowProjects) {
-      return {};
-    }
-
-    return {
+    const baseParams = {
       stepType: this.stepType,
       giverEntityType: this.giverEntityType,
       recipientEntityType: this.recipientEntityType,
-      ...(this.stepType === "giver"
-        ? {
-            recipientProjectId: this.toProjectId || "",
-            recipientProjectName: this.receiver?.name || "",
-            recipientProjectImage: this.receiver?.image || "",
-            recipientProjectHandleId: this.receiver?.handleId || "",
-            recipientDid: this.receiver?.did || "",
-          }
-        : {
-            giverProjectId: this.fromProjectId || "",
-            giverProjectName: this.giver?.name || "",
-            giverProjectImage: this.giver?.image || "",
-            giverProjectHandleId: this.giver?.handleId || "",
-            giverDid: this.giver?.did || "",
-          }),
+      // Form field values to preserve
+      description: this.description,
+      amountInput: this.amountInput,
+      unitCode: this.unitCode,
+      offerId: this.offerId,
       fromProjectId: this.fromProjectId,
       toProjectId: this.toProjectId,
       showProjects: this.showProjects.toString(),
       isFromProjectView: this.isFromProjectView.toString(),
     };
+
+    if (this.shouldShowProjects) {
+      // For project contexts, still pass entity type information
+      return baseParams;
+    }
+
+    return {
+      ...baseParams,
+      // Always pass both giver and recipient info for context preservation
+      giverProjectId: this.fromProjectId || "",
+      giverProjectName: this.giver?.name || "",
+      giverProjectImage: this.giver?.image || "",
+      giverProjectHandleId: this.giver?.handleId || "",
+      giverDid: this.giverEntityType === "person" ? this.giver?.did || "" : "",
+      recipientProjectId: this.toProjectId || "",
+      recipientProjectName: this.receiver?.name || "",
+      recipientProjectImage: this.receiver?.image || "",
+      recipientProjectHandleId: this.receiver?.handleId || "",
+      recipientDid:
+        this.recipientEntityType === "person" ? this.receiver?.did || "" : "",
+    };
   }
 
   /**