From 5b7ccf9ef0f619b9f576b2c5d8d46f3c3a4b1093 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sun, 5 Nov 2023 07:46:16 -0700
Subject: [PATCH] fix where the project ID was not included; fix the pause when
 submitting give & show toast of aknowledgement; remove 'emit'

---
 project.task.yaml                |  3 +--
 src/components/GiftedDialog.vue  | 46 +++++++++++++++++---------------
 src/views/ContactGiftingView.vue |  7 +----
 src/views/HomeView.vue           |  7 +----
 src/views/ProjectViewView.vue    |  2 +-
 5 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/project.task.yaml b/project.task.yaml
index ecb71d183..be6d7e6e5 100644
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,7 +1,6 @@
 
 tasks:
 
-- figure out why a give directly on the project doesn't show in that project afterward
 - in endorser-push-server - mount folder for persistent sqlite DB outside of container
 - test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
 - 40 notifications :
@@ -28,7 +27,7 @@ tasks:
 
 - 24 Move to Vite assignee:matthew
 
-- .2 fit more than 8 icons on home & project view screens, with a "more" button to contacts page if there are more than 2 rows
+- .2 fit as many icons as possible on home & project view screens but only going halfway down the page
 - .1 Remove notification alert visuals on home page
 - .5 Add infinite scroll to gifts on the home page
 - .5 bug - search for "Safari" does not find the project, but if already on the "Anywhere" tab it shows all
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 08adbe9a0..c47c89ddc 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -51,16 +51,9 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop, Emit } from "vue-facing-decorator";
-import {
-  createAndSubmitGive,
-  CreateAndSubmitGiveResult,
-  ErrorResult,
-  GiverInputInfo,
-  GiverOutputInfo,
-} from "@/libs/endorserServer";
+import { Vue, Component, Prop } from "vue-facing-decorator";
+import { createAndSubmitGive, GiverInputInfo } from "@/libs/endorserServer";
 import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { Account } from "@/db/tables/accounts";
 
@@ -76,6 +69,7 @@ export default class GiftedDialog extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
 
   @Prop message = "";
+  @Prop projectId = "";
 
   activeDid = "";
   apiServer = "";
@@ -93,7 +87,7 @@ export default class GiftedDialog extends Vue {
       this.activeDid = settings?.activeDid || "";
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings from database.", err);
+      console.log("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
@@ -125,27 +119,34 @@ export default class GiftedDialog extends Vue {
     this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
   }
 
-  @Emit("dialog-result")
-  cancel(): GiverOutputInfo {
+  cancel() {
     this.close();
     this.description = "";
     this.giver = undefined;
     this.hours = "0";
-    return { action: "cancel" };
   }
 
-  @Emit("dialog-result")
   async confirm() {
-    await this.recordGive(
+    this.close();
+    this.$notify(
+      {
+        group: "alert",
+        type: "toast",
+        text: "Recording the give...",
+        title: "",
+      },
+      1000,
+    );
+    // this is asynchronous, but we don't need to wait for it to complete
+    this.recordGive(
       this.giver?.did as string | undefined,
       this.description,
       parseFloat(this.hours),
-    );
-    this.close();
-    this.description = "";
-    this.giver = undefined;
-    this.hours = "0";
-    return { action: "confirm" };
+    ).then(() => {
+      this.description = "";
+      this.giver = undefined;
+      this.hours = "0";
+    });
   }
 
   public async getIdentity(activeDid: string) {
@@ -211,6 +212,7 @@ export default class GiftedDialog extends Vue {
         this.activeDid,
         description,
         hours,
+        this.projectId,
       );
 
       if (
@@ -236,7 +238,7 @@ export default class GiftedDialog extends Vue {
             title: "Success",
             text: "That gift was recorded.",
           },
-          -1,
+          10000,
         );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index 516afdbc3..828a30e13 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -66,12 +66,7 @@
       </li>
     </ul>
 
-    <GiftedDialog
-      ref="customDialog"
-      @dialog-result="handleDialogResult"
-      message="Received from"
-    >
-    </GiftedDialog>
+    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
   </section>
 </template>
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index f9d60759e..f334036f4 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -58,12 +58,7 @@
       </div>
     </div>
 
-    <GiftedDialog
-      ref="customDialog"
-      @dialog-result="handleDialogResult"
-      message="Received from"
-    >
-    </GiftedDialog>
+    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
 
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <h2 class="text-xl font-bold mb-4">Latest Activity</h2>
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index a256bbdee..2d62d422c 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -196,8 +196,8 @@
 
     <GiftedDialog
       ref="customDialog"
-      @dialog-result="handleDialogResult"
       message="Received from"
+      :projectId="this.projectId"
     >
     </GiftedDialog>
   </section>