Merge branch 'master' into gifting-periphery-improvements

src/views/HomeView.vue

@@ -12,6 +12,7 @@ Raymer * @version 1.0.0 */
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <h1 id="ViewHeading" class="text-4xl text-center font-light mb-8">
       {{ AppString.APP_NAME }}
+      <span class="text-xs text-gray-500">{{ package.version }}</span>
     </h1>
 
     <OnboardingDialog ref="onboardingDialog" />
@@ -106,12 +107,12 @@ Raymer * @version 1.0.0 */
               </button>
             </div>
             <UserNameDialog ref="userNameDialog" />
-            <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
+            <div class="flex justify-end w-full">
               <router-link
                 :to="{ name: 'start' }"
                 class="block text-right text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
               >
-                See all your options first
+                See advanced options
               </router-link>
             </div>
           </div>
@@ -325,6 +326,7 @@ import * as serverUtil from "../libs/endorserServer";
 import { logger } from "../utils/logger";
 import { GiveRecordWithContactInfo } from "../interfaces/give";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import * as Package from "../../package.json";
 
 interface Claim {
   claim?: Claim; // For nested claims in Verifiable Credentials
@@ -415,11 +417,13 @@ export default class HomeView extends Vue {
 
   AppString = AppString;
   PASSKEYS_ENABLED = PASSKEYS_ENABLED;
+  package = Package;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
+  blockedContactDids: Array<string> = [];
   feedData: GiveRecordWithContactInfo[] = [];
   feedPreviousOldestId?: string;
   feedLastViewedClaimId?: string;
@@ -492,7 +496,6 @@ export default class HomeView extends Vue {
       // Retrieve DIDs with better error handling
       try {
         this.allMyDids = await retrieveAccountDids();
-        logConsoleAndDb(`[HomeView] Retrieved ${this.allMyDids.length} DIDs`);
       } catch (error) {
         logConsoleAndDb(`[HomeView] Failed to retrieve DIDs: ${error}`, true);
         throw new Error(
@@ -525,9 +528,6 @@ export default class HomeView extends Vue {
         if (USE_DEXIE_DB) {
           settings = await retrieveSettingsForActiveAccount();
         }
-        logConsoleAndDb(
-          `[HomeView] Retrieved settings for ${settings.activeDid || "no active DID"}`,
-        );
       } catch (error) {
         logConsoleAndDb(
           `[HomeView] Failed to retrieve settings: ${error}`,
@@ -544,25 +544,14 @@ export default class HomeView extends Vue {
 
       // Load contacts with graceful fallback
       try {
-        const platformService = PlatformServiceFactory.getInstance();
-        const dbContacts = await platformService.dbQuery(
-          "SELECT * FROM contacts",
-        );
-        this.allContacts = databaseUtil.mapQueryResultToValues(
-          dbContacts,
-        ) as Contact[];
-        if (USE_DEXIE_DB) {
-          this.allContacts = await db.contacts.toArray();
-        }
-        logConsoleAndDb(
-          `[HomeView] Retrieved ${this.allContacts.length} contacts`,
-        );
+        this.loadContacts();
       } catch (error) {
         logConsoleAndDb(
           `[HomeView] Failed to retrieve contacts: ${error}`,
           true,
         );
         this.allContacts = []; // Ensure we have a valid empty array
+        this.blockedContactDids = [];
         this.$notify(
           {
             group: "alert",
@@ -614,9 +603,6 @@ export default class HomeView extends Vue {
               });
             }
             this.isRegistered = true;
-            logConsoleAndDb(
-              `[HomeView] User ${this.activeDid} is now registered`,
-            );
           }
         } catch (error) {
           logConsoleAndDb(
@@ -658,11 +644,6 @@ export default class HomeView extends Vue {
           this.newOffersToUserHitLimit = offersToUser.hitLimit;
           this.numNewOffersToUserProjects = offersToProjects.data.length;
           this.newOffersToUserProjectsHitLimit = offersToProjects.hitLimit;
-
-          logConsoleAndDb(
-            `[HomeView] Retrieved ${this.numNewOffersToUser} user offers and ` +
-              `${this.numNewOffersToUserProjects} project offers`,
-          );
         }
       } catch (error) {
         logConsoleAndDb(
@@ -734,6 +715,9 @@ export default class HomeView extends Vue {
     if (USE_DEXIE_DB) {
       this.allContacts = await db.contacts.toArray();
     }
+    this.blockedContactDids = this.allContacts
+      .filter((c) => !c.iViewContent)
+      .map((c) => c.did);
   }
 
   /**
@@ -1001,6 +985,7 @@ export default class HomeView extends Vue {
       );
       if (results.data.length > 0) {
         endOfResults = false;
+        // gather any contacts that user has blocked from view
         await this.processFeedResults(results.data);
         await this.updateFeedLastViewedId(results.data);
       }
@@ -1188,7 +1173,7 @@ export default class HomeView extends Vue {
   }
 
   /**
-   * Checks if record should be included based on filters
+   * Checks if record should be included based on filters & preferences
    *
    * @internal
    * @callGraph
@@ -1214,6 +1199,10 @@ export default class HomeView extends Vue {
     record: GiveSummaryRecord,
     fulfillsPlan?: FulfillsPlan,
   ): boolean {
+    if (this.blockedContactDids.includes(record.issuerDid)) {
+      return false;
+    }
+
     if (!this.isAnyFeedFilterOn) {
       return true;
     }
@@ -1832,7 +1821,7 @@ export default class HomeView extends Vue {
             this.axios,
           );
 
-          if (result.type === "success") {
+          if (result.success) {
             this.$notify(
               {
                 group: "alert",