Merge branch 'master' into gifting-ui-2025-05

src/components/GiftedDialog.vue

@@ -177,7 +177,7 @@
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
-import { NotificationIface } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
   createAndSubmitGive,
   didInfo,
@@ -186,7 +186,10 @@ import {
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
 import { retrieveAccountDids } from "../libs/util";
+import { logger } from "../utils/logger";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import EntityIcon from "../components/EntityIcon.vue";
 
 @Component({
@@ -210,7 +213,6 @@ export default class GiftedDialog extends Vue {
   customTitle?: string;
   description = "";
   giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
-  isTrade = false;
   offerId = "";
   prompt = "";
   receiver?: libsUtil.GiverReceiverInputInfo;
@@ -239,11 +241,23 @@ export default class GiftedDialog extends Vue {
     this.currentStep = giver ? 2 : 1;
 
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
+      if (USE_DEXIE_DB) {
+        settings = await retrieveSettingsForActiveAccount();
+      }
       this.apiServer = settings.apiServer || "";
       this.activeDid = settings.activeDid || "";
 
-      this.allContacts = await db.contacts.toArray();
+      const platformService = PlatformServiceFactory.getInstance();
+      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
+      if (result) {
+        this.allContacts = databaseUtil.mapQueryResultToValues(
+          result,
+        ) as unknown as Contact[];
+      }
+      if (USE_DEXIE_DB) {
+        this.allContacts = await db.contacts.toArray();
+      }
 
       this.allMyDids = await retrieveAccountDids();
 
@@ -397,15 +411,12 @@ export default class GiftedDialog extends Vue {
         unitCode,
         this.toProjectId,
         this.offerId,
-        this.isTrade,
+        false,
         undefined,
         this.fromProjectId,
       );
 
-      if (
-        result.type === "error" ||
-        this.isGiveCreationError(result.response)
-      ) {
+      if (!result.success) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
@@ -423,7 +434,7 @@ export default class GiftedDialog extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+            text: `That gift was recorded.`,
           },
           7000,
         );
@@ -452,15 +463,6 @@ export default class GiftedDialog extends Vue {
 
   // Helper functions for readability
 
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
   /**
    * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
    * @returns best guess at an error message